Browse Source

http: Do not setTimeout a not-yet-existent socket

Fixes #4967
v0.10.0-release
isaacs 12 years ago
committed by koichik
parent
commit
e2400f88d8
  1. 9
      lib/http.js
  2. 48
      test/simple/test-http-server-timeout-pipeline.js

9
lib/http.js

@ -445,6 +445,9 @@ function OutgoingMessage() {
this.finished = false; this.finished = false;
this._hangupClose = false; this._hangupClose = false;
this.socket = null;
this.connection = null;
} }
util.inherits(OutgoingMessage, Stream); util.inherits(OutgoingMessage, Stream);
@ -455,6 +458,11 @@ exports.OutgoingMessage = OutgoingMessage;
OutgoingMessage.prototype.setTimeout = function(msecs, callback) { OutgoingMessage.prototype.setTimeout = function(msecs, callback) {
if (callback) if (callback)
this.on('timeout', callback); this.on('timeout', callback);
if (!this.socket) {
this.once('socket', function(socket) {
socket.setTimeout(msecs);
});
} else
this.socket.setTimeout(msecs); this.socket.setTimeout(msecs);
}; };
@ -1056,6 +1064,7 @@ ServerResponse.prototype.assignSocket = function(socket) {
socket.on('close', onServerResponseClose); socket.on('close', onServerResponseClose);
this.socket = socket; this.socket = socket;
this.connection = socket; this.connection = socket;
this.emit('socket', socket);
this._flush(); this._flush();
}; };

48
test/simple/test-http-server-timeout-pipeline.js

@ -0,0 +1,48 @@
// 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 net = require('net');
var server = http.createServer(function(req, res) {
console.log('get', req.url);
res.setTimeout(100, function() {
console.log('timeout on response', req.url);
});
req.on('end', function() {
console.log('end', req.url);
});
}).listen(3000, function() {
var c = net.connect(3000, function() {
c.write('GET /1 HTTP/1.1\r\n' +
'Host: localhost\r\n\r\n');
c.write('GET /2 HTTP/1.1\r\n' +
'Host: localhost\r\n\r\n');
});
});
server.setTimeout(200, function(socket) {
console.log('timeout on server');
socket.destroy();
server.close();
});
Loading…
Cancel
Save