summaryrefslogtreecommitdiff
path: root/lib/url.js
diff options
context:
space:
mode:
authorIlkka Myller <ilkka.myller@nodefield.com>2016-08-21 23:23:31 +0300
committerJames M Snell <jasnell@gmail.com>2016-08-23 12:44:00 -0700
commit286d44e43d179f82a7dde55ed8e67409e21e3013 (patch)
tree8278557fee1df6904636725401297d0be9896597 /lib/url.js
parentb4ea3a08f1507e4260f4fb1fa20a4195f5924091 (diff)
downloadandroid-node-v8-286d44e43d179f82a7dde55ed8e67409e21e3013.tar.gz
android-node-v8-286d44e43d179f82a7dde55ed8e67409e21e3013.tar.bz2
android-node-v8-286d44e43d179f82a7dde55ed8e67409e21e3013.zip
url: fix inconsistent port in url.resolveObject
This commit fixes bug where url.resolveObject returns conflicting host and port values. Fixes: https://github.com/nodejs/node/issues/8213 PR-URL: https://github.com/nodejs/node/pull/8214 Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'lib/url.js')
-rw-r--r--lib/url.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/url.js b/lib/url.js
index 385061b678..64aa7bc59b 100644
--- a/lib/url.js
+++ b/lib/url.js
@@ -781,6 +781,7 @@ Url.prototype.resolveObject = function(relative) {
// it's absolute.
if (relative.host || relative.host === '') {
result.host = relative.host;
+ result.port = relative.port;
result.auth = null;
}
if (relative.hostname || relative.hostname === '') {