http: use 'connect' event only if socket is connecting

Fixes a bug that prevented `ClientRequest.prototype.setTimeout()` from
working properly when the socket was reused for multiple requests.

Fixes: https://github.com/nodejs/node/issues/16716
Refs: https://github.com/nodejs/node/pull/8895
PR-URL: https://github.com/nodejs/node/pull/16725
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/_http_client.js b/lib/_http_client.js
index fedadedcc2..df99daa9d5 100644
--- a/lib/_http_client.js
+++ b/lib/_http_client.js
@@ -728,9 +728,13 @@ ClientRequest.prototype.setTimeout = function setTimeout(msecs, callback) {
   }
 
   this.once('socket', function(sock) {
-    sock.once('connect', function() {
+    if (sock.connecting) {
+      sock.once('connect', function() {
+        sock.setTimeout(msecs, emitTimeout);
+      });
+    } else {
       sock.setTimeout(msecs, emitTimeout);
-    });
+    }
   });
 
   return this;