1 files changed, 5 insertions, 2 deletions
diff --git a/lib/http.js b/lib/http.js
index e057e6baca..50571bf313 100644
--- a/lib/http.js
+++ b/lib/http.js
@@ -1721,15 +1721,18 @@ ClientRequest.prototype.setTimeout = function(msecs, callback) {
     return;
   }
 
+  // Set timeoutCb so that it'll get cleaned up on request end
+  this.timeoutCb = emitTimeout;
   if (this.socket) {
+    var sock = this.socket;
     this.socket.once('connect', function() {
-      this.setTimeout(msecs, emitTimeout);
+      sock.setTimeout(msecs, emitTimeout);
     });
     return;
   }
 
   this.once('socket', function(sock) {
-    this.setTimeout(msecs, emitTimeout);
+    sock.setTimeout(msecs, emitTimeout);
   });
 };