From f10d7217377d9db56a7a4d77c327f31964dad388 Mon Sep 17 00:00:00 2001
From: Robert Nagy <ronagy@icloud.com>
Date: Fri, 31 Jul 2020 14:42:39 +0200
Subject: [PATCH] http: reset headers timeout on headers complete

headers timeout should not occur *after* headers have been
received.

Fixes: https://github.com/nodejs/node/issues/35661

PR-URL: https://github.com/nodejs/node/pull/34578
Backport-PR-URL: https://github.com/nodejs/node/pull/35819
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Pranshu Srivastava <rexagod@gmail.com>
(cherry picked from commit da4d8de9d09f98e6d81b9d5778fa44c26c25ec75)
---
 src/node_http_parser_impl.h                   |  1 +
 .../test-http-parser-timeout-reset.js         | 44 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 test/parallel/test-http-parser-timeout-reset.js

diff --git a/src/node_http_parser_impl.h b/src/node_http_parser_impl.h
index 22aebad0057b71..7c39bc15c72a38 100644
--- a/src/node_http_parser_impl.h
+++ b/src/node_http_parser_impl.h
@@ -265,6 +265,7 @@ class Parser : public AsyncWrap, public StreamListener {
 #ifdef NODE_EXPERIMENTAL_HTTP
     header_nread_ = 0;
 #endif  /* NODE_EXPERIMENTAL_HTTP */
+    header_parsing_start_time_ = 0;
 
     // Arguments for the on-headers-complete javascript callback. This
     // list needs to be kept in sync with the actual argument list for
diff --git a/test/parallel/test-http-parser-timeout-reset.js b/test/parallel/test-http-parser-timeout-reset.js
new file mode 100644
index 00000000000000..e395c1c4573030
--- /dev/null
+++ b/test/parallel/test-http-parser-timeout-reset.js
@@ -0,0 +1,44 @@
+'use strict';
+const common = require('../common');
+
+const net = require('net');
+const { HTTPParser } = process.binding('http_parser');
+
+const server = net.createServer((socket) => {
+  socket.write('HTTP/1.1 200 OK\r\n');
+  socket.write('Transfer-Encoding: chunked\r\n\r\n');
+  setTimeout(() => {
+    socket.write('1\r\n');
+    socket.write('\n\r\n');
+    setTimeout(() => {
+      socket.write('1\r\n');
+      socket.write('\n\r\n');
+      setImmediate(() => {
+        socket.destroy();
+        server.close();
+      });
+    }, 500);
+  }, 500);
+}).listen(0, () => {
+  const socket = net.connect(server.address().port);
+  const parser = new HTTPParser(HTTPParser.RESPONSE, false);
+  parser.initialize(
+    HTTPParser.RESPONSE,
+    {},
+    1e3
+  );
+
+  parser[HTTPParser.kOnTimeout] = common.mustNotCall();
+
+  parser[HTTPParser.kOnHeaders] = common.mustNotCall();
+
+  parser[HTTPParser.kOnExecute] = common.mustCallAtLeast(3);
+
+  parser[HTTPParser.kOnHeadersComplete] = common.mustCall();
+
+  parser[HTTPParser.kOnBody] = common.mustCall(2);
+
+  parser[HTTPParser.kOnMessageComplete] = common.mustNotCall();
+
+  parser.consume(socket._handle);
+});