http: add CONNECT method handling for default Host header with proxy

Archkon · richardlau · commit eacfbd0ca530 · 2026-07-03T16:05:56.000Z
Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64114 Fixes: #63945 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Tim Perry <pimterry@gmail.com>
diff --git a/lib/_http_client.js b/lib/_http_client.js
@@ -526,7 +526,9 @@ function ClientRequest(input, options, cb) {
     const userHostHeader = this.getHeader('host');
 
     if (host && !this.getHeader('host') && setHost) {
-      this.setHeader('Host', hostHeaderFromOptions);
+      const hostHeader = method === 'CONNECT' && options.path ?
+        String(this.path) : hostHeaderFromOptions;
+      this.setHeader('Host', hostHeader);
     }
 
     if (options.auth && !this.getHeader('Authorization')) {
diff --git a/test/parallel/test-http-connect-default-host-header.js b/test/parallel/test-http-connect-default-host-header.js
@@ -0,0 +1,37 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const http = require('http');
+const net = require('net');
+
+const target = 'target.example.com:443';
+
+const server = net.createServer(common.mustCall((socket) => {
+  socket.once('data', common.mustCall((data) => {
+    const rawRequest = data.toString();
+    const requestLines = rawRequest.split('\r\n');
+
+    assert.strictEqual(requestLines[0], `CONNECT ${target} HTTP/1.1`);
+    assert(requestLines.includes(`Host: ${target}`));
+
+    socket.end('HTTP/1.1 200 Connection established\r\n\r\n');
+  }));
+}));
+
+server.listen(0, common.localhostIPv4, common.mustCall(() => {
+  const req = http.request({
+    host: common.localhostIPv4,
+    port: server.address().port,
+    method: 'CONNECT',
+    path: target,
+  }, common.mustNotCall());
+
+  req.on('connect', common.mustCall((res, socket) => {
+    assert.strictEqual(res.statusCode, 200);
+    socket.destroy();
+    server.close();
+  }));
+
+  req.end();
+}));
diff --git a/test/parallel/test-tls-over-http-tunnel.js b/test/parallel/test-tls-over-http-tunnel.js
@@ -61,7 +61,7 @@ const proxy = net.createServer(common.mustCall((clientSocket) => {
                          `CONNECT localhost:${server.address().port} ` +
                          'HTTP/1.1\r\n' +
                          'Proxy-Connections: keep-alive\r\n' +
-                         `Host: localhost:${proxy.address().port}\r\n` +
+                         `Host: localhost:${server.address().port}\r\n` +
                          'Connection: keep-alive\r\n\r\n');
 
       console.log('PROXY: got CONNECT request');

Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,9 @@ function ClientRequest(input, options, cb) {`
`526`	`526`	`const userHostHeader = this.getHeader('host');`
`527`	`527`
`528`	`528`	`if (host && !this.getHeader('host') && setHost) {`
`529`		`- this.setHeader('Host', hostHeaderFromOptions);`
	`529`	`+ const hostHeader = method === 'CONNECT' && options.path ?`
	`530`	`+ String(this.path) : hostHeaderFromOptions;`
	`531`	`+ this.setHeader('Host', hostHeader);`
`530`	`532`	`}`
`531`	`533`
`532`	`534`	`if (options.auth && !this.getHeader('Authorization')) {`