http,https: avoid instanceof for WHATWG URL

PR-URL: #12983 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Timothy Gu <[email protected]> Reviewed-By: Daijiro Wachi <[email protected]> Reviewed-By: Joyee Cheung <[email protected]>
nodejs · May 23, 2017 · 69f3db4 · 69f3db4
1 parent 85e2d56
commit 69f3db4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/_http_client.js b/lib/_http_client.js
@@ -34,7 +34,7 @@ const debug = common.debug;
 const OutgoingMessage = require('_http_outgoing').OutgoingMessage;
 const Agent = require('_http_agent');
 const Buffer = require('buffer').Buffer;
-const urlToOptions = require('internal/url').urlToOptions;
+const { urlToOptions, searchParamsSymbol } = require('internal/url');
 const outHeadersKey = require('internal/http').outHeadersKey;
 const nextTick = require('internal/process/next_tick').nextTick;
 
@@ -82,7 +82,9 @@ function ClientRequest(options, cb) {
     if (!options.hostname) {
       throw new Error('Unable to determine the domain name');
     }
-  } else if (options instanceof url.URL) {
+  } else if (options && options[searchParamsSymbol] &&
+             options[searchParamsSymbol][searchParamsSymbol]) {
+    // url.URL instance
     options = urlToOptions(options);
   } else {
     options = util._extend({}, options);

diff --git a/lib/https.js b/lib/https.js
@@ -29,7 +29,7 @@ const http = require('http');
 const util = require('util');
 const inherits = util.inherits;
 const debug = util.debuglog('https');
-const urlToOptions = require('internal/url').urlToOptions;
+const { urlToOptions, searchParamsSymbol } = require('internal/url');
 
 function Server(opts, requestListener) {
   if (!(this instanceof Server)) return new Server(opts, requestListener);
@@ -221,7 +221,9 @@ exports.request = function request(options, cb) {
     if (!options.hostname) {
       throw new Error('Unable to determine the domain name');
     }
-  } else if (options instanceof url.URL) {
+  } else if (options && options[searchParamsSymbol] &&
+             options[searchParamsSymbol][searchParamsSymbol]) {
+    // url.URL instance
     options = urlToOptions(options);
   } else {
     options = util._extend({}, options);