Skip to content

Commit

Permalink
http: Allow write to socket on timeout events
Browse files Browse the repository at this point in the history
* fixes nodejs#3460
  • Loading branch information
dscape committed Jun 17, 2012
1 parent d614d16 commit 7a59de3
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 1 deletion.
2 changes: 1 addition & 1 deletion lib/http.js
Original file line number Diff line number Diff line change
Expand Up @@ -1657,7 +1657,7 @@ function connectionListener(socket) {

socket.setTimeout(2 * 60 * 1000); // 2 minute timeout
socket.once('timeout', function() {
socket.destroy();
process.nextTick(function() { socket.destroy(); });
});

var parser = parsers.alloc();
Expand Down
49 changes: 49 additions & 0 deletions test/simple/test-http-response-timeout-handler.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// 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 response = "";

var server = http.createServer(function(req, res) {
res.socket.setTimeout(10);
res.socket.on('timeout', function () {
res.writeHead(200, {'Content-Type': 'text/plain'});
res.end('foo');
});
});
server.listen(common.PORT);

server.on('listening', function() {
http.get({
port: common.PORT
}, function(res) {
res.on('data', function(data) {
response += data;
server.close();
});
});
});

process.on('exit', function() {
assert.equal(response, "foo");
});

0 comments on commit 7a59de3

Please sign in to comment.