url: fix WHATWG host formatting error

The current url.format implementation will return an invalid URL string without the host if there is a port and unicode: true. This unexpected behavior is caused by domainToUnicode, which expects a hostname instead of a host string according to node_url.cc. Adds both a fix and a test for the issue. PR-URL: nodejs#20493 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anatoli Papirovski <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Tiancheng "Timothy" Gu <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Daijiro Wachi <[email protected]>
BridgeAR · May 7, 2018 · 2a96ee2 · 2a96ee2
1 parent 8f6ab9f
commit 2a96ee2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/internal/url.js b/lib/internal/url.js
@@ -400,7 +400,9 @@ Object.defineProperties(URL.prototype, {
           ret += '@';
         }
         ret += options.unicode ?
-          domainToUnicode(this.host) : this.host;
+          domainToUnicode(this.hostname) : this.hostname;
+        if (ctx.port !== null)
+          ret += `:${ctx.port}`;
       } else if (ctx.scheme === 'file:') {
         ret += '//';
       }

diff --git a/test/parallel/test-url-format-whatwg.js b/test/parallel/test-url-format-whatwg.js
@@ -111,3 +111,8 @@ assert.strictEqual(
   url.format(myURL, { unicode: 0 }),
   'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c'
 );
+
+assert.strictEqual(
+  url.format(new URL('http://xn--0zwm56d.com:8080/path'), { unicode: true }),
+  'http://测试.com:8080/path'
+);