Browse Source

net: ignore socket.setTimeout(Infinity) (and NaN)

v0.8.7-release
Fedor Indutny 13 years ago
parent
commit
1fa0bca2ad
  1. 2
      lib/net.js
  2. 26
      test/simple/test-net-settimeout.js

2
lib/net.js

@ -160,7 +160,7 @@ Socket.prototype.listen = function() {
Socket.prototype.setTimeout = function(msecs, callback) {
if (msecs > 0) {
if (msecs > 0 && !isNaN(msecs) && isFinite(msecs)) {
timers.enroll(this, msecs);
timers.active(this);
if (callback) {

26
test/simple/test-net-settimeout.js

@ -33,18 +33,24 @@ var server = net.createServer(function(c) {
});
server.listen(common.PORT);
var socket = net.createConnection(common.PORT, 'localhost');
var killers = [0, Infinity, NaN];
socket.setTimeout(T, function() {
var left = killers.length;
killers.forEach(function(killer) {
var socket = net.createConnection(common.PORT, 'localhost');
socket.setTimeout(T, function() {
socket.destroy();
server.close();
assert.ok(false);
});
if (--left === 0) server.close();
assert.ok(killer !== 0);
clearTimeout(timeout);
});
socket.setTimeout(0);
socket.setTimeout(killer);
setTimeout(function() {
var timeout = setTimeout(function() {
socket.destroy();
server.close();
assert.ok(true);
}, T * 2);
if (--left === 0) server.close();
assert.ok(killer === 0);
}, T * 2);
});

Loading…
Cancel
Save