2 files changed, 63 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);
   });
 };
 
diff --git a/test/simple/test-http-client-timeout-event.js b/test/simple/test-http-client-timeout-event.js
new file mode 100644
index 0000000000..9e0e8bd8e5
--- /dev/null
+++ b/test/simple/test-http-client-timeout-event.js
@@ -0,0 +1,58 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+var http = require('http');
+
+var options = {
+  method: 'GET',
+  port: common.PORT,
+  host: '127.0.0.1',
+  path: '/'
+};
+
+var server = http.createServer(function(req, res) {
+  // this space intentionally left blank
+});
+
+server.listen(options.port, options.host, function() {
+  var req = http.request(options, function(res) {
+    // this space intentionally left blank
+  });
+  req.on('error', function() {
+    // this space is intentially left blank
+  });
+  req.on('close', function() {
+    server.close();
+  });
+
+  var timeout_events = 0;
+  req.setTimeout(1);
+  req.on('timeout', function () {
+    timeout_events += 1;
+  });
+  setTimeout(function () {
+    req.destroy();
+    assert.equal(timeout_events, 1);
+  }, 10);
+  req.end();
+});