http: fix keep-alive not timing out after post-request empty line

islandryu · RafaelGSS · commit c9dc0a89037e · 2025-06-24T11:10:15.000-03:00
Fixes: #58140 PR-URL: #58178 Reviewed-By: Paolo Insogna <paolo@cowtech.it> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
diff --git a/lib/_http_server.js b/lib/_http_server.js
@@ -918,8 +918,6 @@ function socketOnError(e) {
 }
 
 function onParserExecuteCommon(server, socket, parser, state, ret, d) {
-  resetSocketTimeout(server, socket, state);
-
   if (ret instanceof Error) {
     prepareError(ret, parser, d);
     debug('parse error', ret);
diff --git a/test/parallel/test-http-keep-alive-empty-line.mjs b/test/parallel/test-http-keep-alive-empty-line.mjs
@@ -0,0 +1,50 @@
+import * as common from '../common/index.mjs';
+import assert from 'node:assert';
+import { createServer } from 'node:http';
+import { connect } from 'node:net';
+
+const server = createServer({
+  connectionsCheckingInterval: 100,
+  headersTimeout: 100,
+  keepAliveTimeout: 300
+}, (req, res) => {
+  res.writeHead(404);
+  res.end();
+
+  req.socket.on('close', common.mustCall(() => {
+    server.close();
+  }));
+});
+
+server.listen(0, () => {
+  const client = connect({
+    host: 'localhost',
+    port: server.address().port,
+  }, () => {
+    client.write(
+      'GET / HTTP/1.1\r\n' +
+          'Host: localhost:3000\r\n' +
+          'Content-Length: 0\r\n' +
+          '\r\n'
+    );
+
+    setTimeout(() => {
+      client.write('\r\n');
+    }, 100);
+
+    let responseBuffer = '';
+
+    client.on('data', (chunk) => {
+      responseBuffer += chunk.toString();
+
+      // Check if we've received the full header (ending with \r\n\r\n)
+      if (responseBuffer.includes('\r\n\r\n')) {
+        const statusLine = responseBuffer.split('\r\n')[0];
+        const status = statusLine.split(' ')[1];
+        assert.strictEqual(status, '404');
+        client.end();
+      }
+    });
+    client.on('end', common.mustCall());
+  });
+});

Original file line number	Diff line number	Diff line change
`@@ -918,8 +918,6 @@ function socketOnError(e) {`
`918`	`918`	`}`
`919`	`919`
`920`	`920`	`function onParserExecuteCommon(server, socket, parser, state, ret, d) {`
`921`		`- resetSocketTimeout(server, socket, state);`
`922`		`-`
`923`	`921`	`if (ret instanceof Error) {`
`924`	`922`	`prepareError(ret, parser, d);`
`925`	`923`	`debug('parse error', ret);`