url: fix inconsistent port in url.resolveObject

This commit fixes bug where url.resolveObject returns conflicting host and port values. Fixes: nodejs#8213 PR-URL: nodejs#8214 Reviewed-By: James M Snell <[email protected]>
imyller · Sep 30, 2016 · a0d55cb · a0d55cb
1 parent a98d730
commit a0d55cb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/lib/url.js b/lib/url.js
@@ -564,8 +564,10 @@ Url.prototype.resolveObject = function(relative) {
 
   if (isRelAbs) {
     // it's absolute.
-    result.host = (relative.host || relative.host === '') ?
-                  relative.host : result.host;
+    if (relative.host || relative.host === '') {
+      result.host = relative.host;
+      result.port = relative.port;
+    }
     result.hostname = (relative.hostname || relative.hostname === '') ?
                       relative.hostname : result.hostname;
     result.search = relative.search;

diff --git a/test/parallel/test-url.js b/test/parallel/test-url.js
@@ -1513,7 +1513,13 @@ var relativeTests2 = [
   //changeing auth
   ['http://diff:[email protected]',
    'http://asdf:[email protected]',
-   'http://diff:[email protected]/']
+   'http://diff:[email protected]/'],
+
+  // changing port
+  ['https://example.com:81/',
+   'https://example.com:82/',
+   'https://example.com:81/']
+
 ];
 relativeTests2.forEach(function(relativeTest) {
   const a = url.resolve(relativeTest[1], relativeTest[0]);