mirrors/node
0
0 Fork 0
mirror of https://github.com/nodejs/node.git synced 2026-10-28 18:25:13 +08:00
Code Activity

http,https: fix double ERR_PROXY_TUNNEL emission

Browse Source 
Fixes: https://github.com/nodejs/node/issues/60697
PR-URL: https://github.com/nodejs/node/pull/60699
Reviewed-By: Tim Perry <pimterry@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
This commit is contained in:
Shima Ryuhei authored and GitHub committed 2025-11-15 09:29:08 +00:00
1 parent 44ed25a94b
commit 2e944d7de1
6 files changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/_http_agent.js
+1 -2
View File
@@ -284,9 +284,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);
}
}
lib/_http_client.js
+2 -1
View File
@@ -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;
test/client-proxy/test-https-proxy-request-malformed-response.mjs
+1 -1
View File
@@ -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);
test/client-proxy/test-https-proxy-request-proxy-failure-404.mjs
+1 -1
View File
@@ -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);
test/client-proxy/test-https-proxy-request-proxy-failure-500.mjs
+1 -1
View File
@@ -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);
test/client-proxy/test-https-proxy-request-proxy-failure-502.mjs
+1 -1
View File
@@ -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);