nodejs
diff --git a/‎lib/_http_client.js‎
Lines changed: 7 additions & 1 deletion b/‎lib/_http_client.js‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎test/parallel/test-http-client-timeout-option-listeners.js‎
Lines changed: 44 additions & 0 deletions b/‎test/parallel/test-http-client-timeout-option-listeners.js‎
Lines changed: 44 additions & 0 deletions
@@ -563,7 +563,13 @@ function tickOnSocket(req, socket) {
   socket.on('close', socketCloseListener);
 
   if (req.timeout) {
-    socket.once('timeout', () => req.emit('timeout'));
+    const emitRequestTimeout = () => req.emit('timeout');
+    socket.once('timeout', emitRequestTimeout);
+    req.once('response', (res) => {
+      res.once('end', () => {
+        socket.removeListener('timeout', emitRequestTimeout);
+      });
+    });
   }
   req.emit('socket', socket);
 }
 
@@ -0,0 +1,44 @@
+'use strict';
+const common = require('../common');
+const http = require('http');
+const assert = require('assert');
+
+const agent = new http.Agent({ keepAlive: true });
+
+const server = http.createServer((req, res) => {
+  res.end('');
+});
+
+const options = {
+  agent,
+  method: 'GET',
+  port: undefined,
+  host: common.localhostIPv4,
+  path: '/',
+  timeout: common.platformTimeout(100)
+};
+
+server.listen(0, options.host, common.mustCall(() => {
+  options.port = server.address().port;
+  doRequest(common.mustCall((numListeners) => {
+    assert.strictEqual(numListeners, 1);
+    doRequest(common.mustCall((numListeners) => {
+      assert.strictEqual(numListeners, 1);
+      server.close();
+      agent.destroy();
+    }));
+  }));
+}));
+
+function doRequest(cb) {
+  http.request(options, common.mustCall((response) => {
+    const sockets = agent.sockets[`${options.host}:${options.port}:`];
+    assert.strictEqual(sockets.length, 1);
+    const socket = sockets[0];
+    const numListeners = socket.listeners('timeout').length;
+    response.resume();
+    response.once('end', common.mustCall(() => {
+      process.nextTick(cb, numListeners);
+    }));
+  })).end();
+}
Original file line number	Diff line number	Diff line change
@@ -563,7 +563,13 @@ function tickOnSocket(req, socket) {
563	563	socket.on('close', socketCloseListener);
564	564
565	565	if (req.timeout) {
566		- socket.once('timeout', () => req.emit('timeout'));
	566	+ const emitRequestTimeout = () => req.emit('timeout');
	567	+ socket.once('timeout', emitRequestTimeout);
	568	+ req.once('response', (res) => {
	569	+ res.once('end', () => {
	570	+ socket.removeListener('timeout', emitRequestTimeout);
	571	+ });
	572	+ });
567	573	}
568	574	req.emit('socket', socket);
569	575	}