archive/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2025-08-15 21:58:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

http: refactor headersTimeout and requestTimeout logic

Browse source 
PR-URL: https://github.com/nodejs/node/pull/41263
Fixes: https://github.com/nodejs/node/issues/33440
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
This commit is contained in:
Paolo Insogna 2022-04-13 16:47:59 +02:00 • committed by GitHub
parent 9d6af7d1fe
commit 3caa2c1a00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 858 additions and 413 deletions
Download patch file Download diff file Expand all files Collapse all files

39
test/parallel/test-http-server-request-timeout-keepalive.js
View file

@ -8,36 +8,36 @@ const { connect } = require('net');
// This test validates that the server returns 408
// after server.requestTimeout if the client
// does not complete a request, and that keep alive
// works properly
// works properly.
function performRequestWithDelay(client, firstDelay, secondDelay) {
function performRequestWithDelay(client, firstDelay, secondDelay, closeAfter) {
client.resume();
client.write('GET / HTTP/1.1\r\n');
firstDelay = common.platformTimeout(firstDelay);
secondDelay = common.platformTimeout(secondDelay);
console.log('performRequestWithDelay', firstDelay, secondDelay);
setTimeout(() => {
client.write('Connection: ');
}, firstDelay).unref();
// Complete the request
setTimeout(() => {
client.write('keep-alive\r\n\r\n');
client.write(`${closeAfter ? 'close' : 'keep-alive'}\r\n\r\n`);
}, firstDelay + secondDelay).unref();
}
const server = createServer(common.mustCallAtLeast((req, res) => {
const requestTimeout = common.platformTimeout(1000);
const server = createServer({
headersTimeout: 0,
requestTimeout,
keepAliveTimeout: 0,
connectionsCheckingInterval: common.platformTimeout(250),
}, common.mustCallAtLeast((req, res) => {
res.writeHead(200, { 'Content-Type': 'text/plain' });
res.end();
}));
// 0 seconds is the default
assert.strictEqual(server.requestTimeout, 0);
const requestTimeout = common.platformTimeout(1000);
server.requestTimeout = requestTimeout;
assert.strictEqual(server.requestTimeout, requestTimeout);
// Make sure keepAliveTimeout is big enough for the requestTimeout.
@ -58,9 +58,7 @@ server.listen(0, common.mustCall(() => {
'HTTP/1.1 200 OK'
);
const defer = common.platformTimeout(server.requestTimeout * 1.5);
console.log('defer by', defer);
const defer = common.platformTimeout(requestTimeout * 1.5);
// Wait some time to make sure requestTimeout
// does not interfere with keep alive
@ -69,13 +67,17 @@ server.listen(0, common.mustCall(() => {
second = true;
// Perform a second request expected to finish after requestTimeout
performRequestWithDelay(client, 1000, 3000);
performRequestWithDelay(
client,
requestTimeout / 5,
requestTimeout,
true
);
}, defer).unref();
}
}, 1));
const errOrEnd = common.mustCall(function(err) {
console.log(err);
assert.strictEqual(second, true);
assert.strictEqual(
response,
@ -90,5 +92,10 @@ server.listen(0, common.mustCall(() => {
client.on('end', errOrEnd);
// Perform a second request expected to finish before requestTimeout
performRequestWithDelay(client, 50, 500);
performRequestWithDelay(
client,
requestTimeout / 5,
requestTimeout / 5,
false
);
}));