https: allow url and options to be passed to https.request

PR-URL: #22003 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: James M Snell <[email protected]> Backport-PR-URL: #21880 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Matteo Collina <[email protected]>

Author: rubys

lib/https.js

@@ -255,25 +255,33 @@ Agent.prototype._evictSession = function _evictSession(key){
 
 constglobalAgent=newAgent();
 
-functionrequest(options,cb){
-if(typeofoptions==='string'){
-options=url.parse(options);
+functionrequest(...args){
+letoptions={};
+
+if(typeofargs[0]==='string'){
+consturlStr=args.shift();
+options=url.parse(urlStr);
 if(!options.hostname){
 thrownewERR_INVALID_DOMAIN_NAME();
 }
-}elseif(options&&options[searchParamsSymbol]&&
-options[searchParamsSymbol][searchParamsSymbol]){
+}elseif(args[0]&&args[0][searchParamsSymbol]&&
+args[0][searchParamsSymbol][searchParamsSymbol]){
 // url.URL instance
-options=urlToOptions(options);
-}else{
-options=util._extend({},options);
+options=urlToOptions(args.shift());
+}
+
+if(args[0]&&typeofargs[0]!=='function'){
+options=util._extend(options,args.shift());
 }
+
 options._defaultAgent=globalAgent;
-returnnewClientRequest(options,cb);
+args.unshift(options);
+
+returnnewClientRequest(...args);
 }
 
-functionget(options,cb){
-constreq=request(options,cb);
+functionget(input,options,cb){
+constreq=request(input,options,cb);
 req.end();
 returnreq;
 }

test/parallel/test-https-request-arguments.js

@@ -0,0 +1,46 @@
+'use strict';
+constcommon=require('../common');
+constassert=require('assert');
+consthttps=require('https');
+constfixtures=require('../common/fixtures');
+
+if(!common.hasCrypto)
+common.skip('missing crypto');
+
+constoptions={
+key: fixtures.readKey('agent1-key.pem'),
+cert: fixtures.readKey('agent1-cert.pem'),
+ca: fixtures.readKey('ca1-cert.pem')
+};
+
+// Test providing both a url and options, with the options partially
+// replacing address and port portions of the URL provided.
+{
+constserver=https.createServer(
+options,
+common.mustCall((req,res)=>{
+assert.strictEqual(req.url,'/testpath');
+res.end();
+server.close();
+})
+);
+
+server.listen(
+0,
+common.mustCall(()=>{
+https.get(
+'https://example.com/testpath',
+
+{
+hostname: 'localhost',
+port: server.address().port,
+rejectUnauthorized: false
+},
+
+common.mustCall((res)=>{
+res.resume();
+})
+);
+})
+);
+}