Browse Source
http,https: avoid instanceof for WHATWG URL
PR-URL: https://github.com/nodejs/node/pull/12983
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
v6
Brian White
8 years ago
No known key found for this signature in database
GPG Key ID: 606D7358F94DA209
2 changed files with
8 additions and
4 deletions
-
lib/_http_client.js
-
lib/https.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); |
|
|
|
|
|
@ -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); |
|
|
|