fix test

nodejs · Sep 19, 2023 · 289444e · 289444e
1 parent 37d005a
commit 289444e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/lib/_http_client.js b/lib/_http_client.js
@@ -186,9 +186,11 @@ function ClientRequest(input, options, cb) {
   const defaultPort = options.defaultPort ||
                     (this.agent && this.agent.defaultPort);
 
-  const port = options.port = options.port || defaultPort || 80;
-  const host = options.host = validateHost(options.hostname, 'hostname') ||
-                            validateHost(options.host, 'host') || 'localhost';
+  const optsWithoutSignal = { __proto__: null, ...options };
+
+  const port = optsWithoutSignal.port = options.port || defaultPort || 80;
+  const host = optsWithoutSignal.host = validateHost(options.hostname, 'hostname') ||
+                                        validateHost(options.host, 'host') || 'localhost';
 
   const setHost = (options.setHost === undefined || Boolean(options.setHost));
 
@@ -200,6 +202,7 @@ function ClientRequest(input, options, cb) {
   const signal = options.signal;
   if (signal) {
     addAbortSignal(signal, this);
+    delete optsWithoutSignal.signal;
   }
   let method = options.method;
   const methodIsString = (typeof method === 'string');
@@ -326,12 +329,6 @@ function ClientRequest(input, options, cb) {
 
   this[kUniqueHeaders] = parseUniqueHeadersOption(options.uniqueHeaders);
 
-  let optsWithoutSignal = options;
-  if (optsWithoutSignal.signal) {
-    optsWithoutSignal = ObjectAssign({}, options);
-    delete optsWithoutSignal.signal;
-  }
-
   // initiate connection
   if (this.agent) {
     this.agent.addRequest(this, optsWithoutSignal);

diff --git a/test/parallel/test-http-client-input-function.js b/test/parallel/test-http-client-input-function.js
@@ -3,15 +3,14 @@
 const common = require('../common');
 const http = require('http');
 const assert = require('assert');
-const ClientRequest = require('http').ClientRequest;
 
 {
   const server = http.createServer(common.mustCall((req, res) => {
     res.writeHead(200);
     res.end('hello world');
   })).listen(80, '127.0.0.1');
 
-  const req = new ClientRequest(common.mustCall((response) => {
+  const req = new http.ClientRequest(common.mustCall((response) => {
     let body = '';
     response.setEncoding('utf8');
     response.on('data', (chunk) => {