summaryrefslogtreecommitdiff
path: root/lib/internal/url.js
diff options
context:
space:
mode:
authorSergey Golovin <golovim@gmail.com>2018-03-08 15:30:46 +0300
committerRuben Bridgewater <ruben@bridgewater.de>2018-04-10 00:48:42 +0200
commita892d9a0c1facba70753398a41d9dbd74ba83396 (patch)
treecde64ef45a705b7abb7c3f3fcc965f1cb66c738f /lib/internal/url.js
parentb34a1e17850761f2edb91e9f588a78f83acd0c1c (diff)
downloadandroid-node-v8-a892d9a0c1facba70753398a41d9dbd74ba83396.tar.gz
android-node-v8-a892d9a0c1facba70753398a41d9dbd74ba83396.tar.bz2
android-node-v8-a892d9a0c1facba70753398a41d9dbd74ba83396.zip
url: use existing handlers instead of duplicated code
PR-URL: https://github.com/nodejs/node/pull/19267 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Diffstat (limited to 'lib/internal/url.js')
-rw-r--r--lib/internal/url.js21
1 files changed, 7 insertions, 14 deletions
diff --git a/lib/internal/url.js b/lib/internal/url.js
index 8c83ca86c3..1d5220df0b 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];