2 files changed, 96 insertions, 0 deletions
diff --git a/lib/http.js b/lib/http.js
index e226da334a..9178780238 100644
--- a/lib/http.js
+++ b/lib/http.js
@@ -1474,6 +1474,10 @@ function responseOnEnd() {
     assert(!socket.writable);
   } else {
     debug('AGENT socket keep-alive');
+    if (req.timeoutCb) {
+      socket.setTimeout(0, req.timeoutCb);
+      req.timeoutCb = null;
+    }
     socket.removeListener('close', socketCloseListener);
     socket.removeListener('error', socketErrorListener);
     socket.emit('free');
@@ -1554,6 +1558,9 @@ ClientRequest.prototype.setTimeout = function(msecs, callback) {
   }
 
   if (this.socket && this.socket.writable) {
+    if (this.timeoutCb)
+      this.socket.setTimeout(0, this.timeoutCb);
+    this.timeoutCb = emitTimeout;
     this.socket.setTimeout(msecs, emitTimeout);
     return;
   }
diff --git a/test/simple/test-http-client-timeout-agent.js b/test/simple/test-http-client-timeout-agent.js
new file mode 100644
index 0000000000..d3b30ea8e0
--- /dev/null
+++ b/test/simple/test-http-client-timeout-agent.js
@@ -0,0 +1,89 @@
+// 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 request_number = 0;
+var requests_sent = 0;
+var requests_done = 0;
+var options = {
+  method: 'GET',
+  port: common.PORT,
+  host: '127.0.0.1',
+};
+
+//http.globalAgent.maxSockets = 15;
+
+var server = http.createServer(function(req, res) {
+  var m = /\/(.*)/.exec(req.url),
+      reqid = parseInt(m[1], 10);
+  if ( reqid % 2 ) {
+    // do not reply the request
+  } else {
+    res.writeHead(200, {'Content-Type': 'text/plain'});
+    res.write(reqid.toString());
+    res.end();
+  }
+  request_number+=1;
+});
+
+server.listen(options.port, options.host, function() {
+  var req;
+
+  for (requests_sent = 0; requests_sent < 30; requests_sent+=1) {
+    options.path = '/' + requests_sent;
+    req = http.request(options);
+    req.id = requests_sent;
+    req.on('response', function(res) {
+      res.on('data', function(data) {
+        console.log('res#'+this.req.id+' data:'+data);
+      });
+      res.on('end', function(data) {
+        console.log('res#'+this.req.id+' end');
+        requests_done += 1;
+      });
+    });
+    req.on('close', function() {
+      console.log('req#'+this.id+' close');
+    });
+    req.on('error', function() {
+      console.log('req#'+this.id+' error');
+      this.destroy();
+    });
+    req.setTimeout(50, function () {
+      var req = this;
+      console.log('req#'+this.id + ' timeout');
+      req.abort();
+      requests_done += 1;
+    });
+    req.end();
+  }
+  setTimeout(function() {
+    server.close();
+  }, 150);
+});
+
+process.on('exit', function() {
+  console.error('done=%j sent=%j', requests_done, requests_sent);
+  assert.ok(requests_done == requests_sent, 'timeout on http request called too much');
+});