From a892d9a0c1facba70753398a41d9dbd74ba83396 Mon Sep 17 00:00:00 2001 From: Sergey Golovin Date: Thu, 8 Mar 2018 15:30:46 +0300 Subject: [PATCH] url: use existing handlers instead of duplicated code PR-URL: https://github.com/nodejs/node/pull/19267 Reviewed-By: James M Snell Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Trivikram Kamat Reviewed-By: Ruben Bridgewater --- lib/internal/url.js | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/lib/internal/url.js b/lib/internal/url.js index 8c83ca86c3f..1d5220df0b9 100644 --- a/lib/internal/url.js +++ b/lib/internal/url.js @@ -256,20 +256,6 @@ function onParseProtocolComplete(flags, protocol, username, password, ctx.port = port; } -function onParseHostComplete(flags, protocol, username, password, - host, port, path, query, fragment) { - const ctx = this[context]; - if ((flags & URL_FLAGS_HAS_HOST) !== 0) { - ctx.host = host; - ctx.flags |= URL_FLAGS_HAS_HOST; - } else { - ctx.host = null; - ctx.flags &= ~URL_FLAGS_HAS_HOST; - } - if (port !== null) - ctx.port = port; -} - function onParseHostnameComplete(flags, protocol, username, password, host, port, path, query, fragment) { const ctx = this[context]; @@ -287,6 +273,13 @@ function onParsePortComplete(flags, protocol, username, password, this[context].port = port; } +function onParseHostComplete(flags, protocol, username, password, + host, port, path, query, fragment) { + onParseHostnameComplete.apply(this, arguments); + if (port !== null) + onParsePortComplete.apply(this, arguments); +} + function onParsePathComplete(flags, protocol, username, password, host, port, path, query, fragment) { const ctx = this[context];