Skip to content

Commit

Permalink
http: unref socket timer on parser execute
Browse files Browse the repository at this point in the history
When underlying `net.Socket` instance is consumed in http server - no
`data` events are emitted, and thus `socket.setTimeout` fires the
callback even if the data is constantly flowing into the socket.

Fix this by calling `socket._unrefTimer()` on every `onParserExecute`
call.

Fix: #5899
PR-URL: #6286
Reviewed-By: James M Snell <[email protected]>
  • Loading branch information
indutny authored and jasnell committed Apr 26, 2016
1 parent f3d9de7 commit 816df10
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 0 deletions.
1 change: 1 addition & 0 deletions lib/_http_server.js
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,7 @@ function connectionListener(socket) {
}

function onParserExecute(ret, d) {
socket._unrefTimer();
debug('SERVER socketOnParserExecute %d', ret);
onParserExecuteCommon(ret, undefined);
}
Expand Down
36 changes: 36 additions & 0 deletions test/parallel/test-http-server-consumed-timeout.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
'use strict';

const common = require('../common');
const assert = require('assert');
const http = require('http');

const server = http.createServer((req, res) => {
server.close();

res.writeHead(200);
res.flushHeaders();

req.setTimeout(common.platformTimeout(200), () => {
assert(false, 'Should not happen');
});
req.resume();
req.once('end', common.mustCall(() => {
res.end();
}));
});

server.listen(common.PORT, common.mustCall(() => {
const req = http.request({
port: common.PORT,
method: 'POST'
}, (res) => {
const interval = setInterval(() => {
req.write('a');
}, common.platformTimeout(25));
setTimeout(() => {
clearInterval(interval);
req.end();
}, common.platformTimeout(400));
});
req.write('.');
}));

0 comments on commit 816df10

Please sign in to comment.