url: fix inconsistent port in url.resolveObject

imyller · jasnell · commit 286d44e43d17 · 2016-08-23T12:44:00.000-07:00
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 <jasnell@gmail.com>
diff --git 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 === '') {
diff --git a/test/parallel/test-url.js b/test/parallel/test-url.js
@@ -1570,6 +1570,11 @@ var relativeTests2 = [
    'http://asdf:qwer@www.example.com',
    'http://diff:auth@www.example.com/'],
 
+  // changing port
+  ['https://example.com:81/',
+   'https://example.com:82/',
+   'https://example.com:81/'],
+
   // https://github.com/nodejs/node/issues/1435
   ['https://another.host.com/',
    'https://user:password@example.org/',

Original file line number	Diff line number	Diff line change
`@@ -781,6 +781,7 @@ Url.prototype.resolveObject = function(relative) {`
`781`	`781`	`// it's absolute.`
`782`	`782`	`if (relative.host \|\| relative.host === '') {`
`783`	`783`	`result.host = relative.host;`
	`784`	`+ result.port = relative.port;`
`784`	`785`	`result.auth = null;`
`785`	`786`	`}`
`786`	`787`	`if (relative.hostname \|\| relative.hostname === '') {`