http,https: fix double ERR_PROXY_TUNNEL emission

islandryu · aduh95 · commit f074c126a817 · 2026-02-24T00:36:56.000+01:00
Fixes: #60697 PR-URL: #60699 Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
diff --git a/lib/_http_agent.js b/lib/_http_agent.js
@@ -283,9 +283,8 @@ function handleSocketAfterProxy(err, req) {
   if (err.code === 'ERR_PROXY_TUNNEL') {
     if (err.proxyTunnelTimeout) {
       req.emit('timeout');  // Propagate the timeout from the tunnel to the request.
-    } else {
-      req.emit('error', err);
     }
+    req.emit('error', err);
   }
 }
 
diff --git a/lib/_http_client.js b/lib/_http_client.js
@@ -958,7 +958,8 @@ function onSocketNT(req, socket, err) {
       if (!req.aborted && !err) {
         err = new ConnResetException('socket hang up');
       }
-      if (err) {
+      // ERR_PROXY_TUNNEL is handled by the proxying logic
+      if (err && err.code !== 'ERR_PROXY_TUNNEL') {
         emitErrorEvent(req, err);
       }
       req._closed = true;
diff --git a/test/client-proxy/test-https-proxy-request-malformed-response.mjs b/test/client-proxy/test-https-proxy-request-malformed-response.mjs
@@ -43,7 +43,7 @@ const { code, signal, stderr, stdout } = await runProxiedRequest({
 });
 
 // The proxy client should get an error from failure in establishing the tunnel.
-assert.match(stderr, /ERR_PROXY_TUNNEL.*Failed to establish tunnel to .* NOT-HTTP MALFORMED RESPONSE/);
+assert.strictEqual(stderr.match(/ERR_PROXY_TUNNEL.*Failed to establish tunnel to .* NOT-HTTP MALFORMED RESPONSE*/g).length, 1);
 assert.strictEqual(stdout.trim(), '');
 assert.strictEqual(code, 0);
 assert.strictEqual(signal, null);
diff --git a/test/client-proxy/test-https-proxy-request-proxy-failure-404.mjs b/test/client-proxy/test-https-proxy-request-proxy-failure-404.mjs
@@ -43,7 +43,7 @@ const { code, signal, stderr, stdout } = await runProxiedRequest({
 });
 
 // The proxy client should get an error from failure in establishing the tunnel.
-assert.match(stderr, /ERR_PROXY_TUNNEL.*Failed to establish tunnel to .* HTTP\/1\.1 404 Not Found/);
+assert.strictEqual(stderr.match(/ERR_PROXY_TUNNEL.*Failed to establish tunnel to .* HTTP\/1\.1 404 Not Found/g).length, 1);
 assert.strictEqual(stdout.trim(), '');
 assert.strictEqual(code, 0);
 assert.strictEqual(signal, null);
diff --git a/test/client-proxy/test-https-proxy-request-proxy-failure-500.mjs b/test/client-proxy/test-https-proxy-request-proxy-failure-500.mjs
@@ -44,7 +44,7 @@ const { code, signal, stderr, stdout } = await runProxiedRequest({
 });
 
 // The proxy client should get an error from failure in establishing the tunnel.
-assert.match(stderr, /ERR_PROXY_TUNNEL.*Failed to establish tunnel to .* HTTP\/1\.1 500 Connection Error/);
+assert.strictEqual(stderr.match(/ERR_PROXY_TUNNEL.*Failed to establish tunnel to .* HTTP\/1\.1 500 Connection Error/g).length, 1);
 assert.strictEqual(stdout.trim(), '');
 assert.strictEqual(code, 0);
 assert.strictEqual(signal, null);
diff --git a/test/client-proxy/test-https-proxy-request-proxy-failure-502.mjs b/test/client-proxy/test-https-proxy-request-proxy-failure-502.mjs
@@ -42,7 +42,7 @@ const { code, signal, stderr, stdout } = await runProxiedRequest({
 });
 
 // The proxy client should get an error from failure in establishing the tunnel.
-assert.match(stderr, /ERR_PROXY_TUNNEL.*Failed to establish tunnel to .* HTTP\/1\.1 502 Bad Gateway/);
+assert.strictEqual(stderr.match(/ERR_PROXY_TUNNEL.*Failed to establish tunnel to .* HTTP\/1\.1 502 Bad Gateway/g).length, 1);
 assert.strictEqual(stdout.trim(), '');
 assert.strictEqual(code, 0);
 assert.strictEqual(signal, null);

Original file line number	Diff line number	Diff line change
`@@ -283,9 +283,8 @@ function handleSocketAfterProxy(err, req) {`
`283`	`283`	`if (err.code === 'ERR_PROXY_TUNNEL') {`
`284`	`284`	`if (err.proxyTunnelTimeout) {`
`285`	`285`	`req.emit('timeout'); // Propagate the timeout from the tunnel to the request.`
`286`		`- } else {`
`287`		`- req.emit('error', err);`
`288`	`286`	`}`
	`287`	`+ req.emit('error', err);`
`289`	`288`	`}`
`290`	`289`	`}`
`291`	`290`
Original file line number	Diff line number	Diff line change
`@@ -958,7 +958,8 @@ function onSocketNT(req, socket, err) {`
`958`	`958`	`if (!req.aborted && !err) {`
`959`	`959`	`err = new ConnResetException('socket hang up');`
`960`	`960`	`}`
`961`		`- if (err) {`
	`961`	`+ // ERR_PROXY_TUNNEL is handled by the proxying logic`
	`962`	`+ if (err && err.code !== 'ERR_PROXY_TUNNEL') {`
`962`	`963`	`emitErrorEvent(req, err);`
`963`	`964`	`}`
`964`	`965`	`req._closed = true;`