Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Fixing ClientRequest setTimeout EventEmitter Leak

This will fix #3068
  • Loading branch information...
ssuda authored and bnoordhuis committed Apr 8, 2012
1 parent 540a441 commit 70005be4ffdcfed0ac371873fa79a308ae4cc546
Showing with 71 additions and 0 deletions.
  1. +5 −0 lib/http.js
  2. +3 −0 lib/net.js
  3. +63 −0 test/simple/test-http-timeout.js
@@ -1471,6 +1471,11 @@ ClientRequest.prototype.setSocketKeepAlive = function() {
this._deferToConnect('setKeepAlive', arguments);
};

ClientRequest.prototype.clearTimeout = function() {
var args = Array.prototype.slice.call(arguments, 0);
args.unshift(0);
this._deferToConnect('setTimeout', args);
};

exports.request = function(options, cb) {
if (options.protocol && options.protocol !== 'http:') {
@@ -173,6 +173,9 @@ Socket.prototype.setTimeout = function(msecs, callback) {
}
} else if (msecs === 0) {
timers.unenroll(this);
if (callback) {
this.removeListener('timeout', callback);
}
}
};

@@ -0,0 +1,63 @@
// 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 port = 12345;
var server = http.createServer(function(req, res) {
res.writeHead(200, {'Content-Type': 'text/plain'});
res.end('OK');
});

var agent = new http.Agent({maxSockets: 1});

server.listen(port, function() {

for (var i = 0; i < 11; ++i) {
createRequest().end();
}

function callback(){}

var count = 0;

function createRequest() {
var req = http.request({port: port, path: '/', agent: agent}, function(res) {

req.clearTimeout(callback);

res.on('end', function() {
count++;

if (count == 11) {
server.close();
}
})
});

req.setTimeout(1000, callback);
return req;
}
});

0 comments on commit 70005be

Please sign in to comment.
You can’t perform that action at this time.