From 95bd7b2910a1733c170e702ae87e4129a9c5e549 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Thu, 29 Nov 2018 22:01:33 -0500
Subject: [PATCH 1/3] http: fix error return in `Finish()`

`http_parser_execute(..., nullptr, 0)` returns either `0` or `1`. The
expectation is that no error must be returned if it is `0`, and if
it is `1` - a `Error` object must be returned back to user.

The introduction of `llhttp` and the refactor that happened during it
accidentally removed the error-returning code. This commit reverts it
back to its original state.

Fix: #24585
---
 src/node_http_parser.cc | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/node_http_parser.cc b/src/node_http_parser.cc
index 18ac6599d80919..4d683b4db2cfaa 100644
--- a/src/node_http_parser.cc
+++ b/src/node_http_parser.cc
@@ -491,7 +491,10 @@ class Parser : public AsyncWrap, public StreamListener {
     ASSIGN_OR_RETURN_UNWRAP(&parser, args.Holder());
 
     CHECK(parser->current_buffer_.IsEmpty());
-    parser->Execute(nullptr, 0);
+    Local<Value> ret = parser->Execute(nullptr, 0);
+
+    if (!ret.IsEmpty())
+      args.GetReturnValue().Set(ret);
   }
 
 
@@ -684,11 +687,28 @@ class Parser : public AsyncWrap, public StreamListener {
     }
 #else  /* !NODE_EXPERIMENTAL_HTTP */
     size_t nread = http_parser_execute(&parser_, &settings, data, len);
-    if (data != nullptr) {
+    err = HTTP_PARSER_ERRNO(&parser_);
+
+    // Finish()
+    if (data == nullptr) {
+      // `http_parser_execute()` returns either `0` or `1` when `len` is 0
+      // (part of the finishing sequence).
+      CHECK_EQ(len, 0);
+      switch (nread) {
+        case 0:
+          err = HPE_OK;
+          break;
+        case 1:
+          nread = 0;
+          break;
+        default:
+          UNREACHABLE();
+      }
+
+    // Regular Execute()
+    } else {
       Save();
     }
-
-    err = HTTP_PARSER_ERRNO(&parser_);
 #endif  /* NODE_EXPERIMENTAL_HTTP */
 
     // Unassign the 'buffer_' variable
@@ -738,6 +758,10 @@ class Parser : public AsyncWrap, public StreamListener {
       return scope.Escape(e);
     }
 
+    // No return value is needed for `Finish()`
+    if (data == nullptr) {
+      return scope.Escape(Local<Value>());
+    }
     return scope.Escape(nread_obj);
   }
 

From 12f9b6a358cbe2bcb065852267c3e57d9dce75e1 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Fri, 30 Nov 2018 10:27:40 -0500
Subject: [PATCH 2/3] test: add test

---
 .../parallel/test-http-parser-finish-error.js | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 test/parallel/test-http-parser-finish-error.js

diff --git a/test/parallel/test-http-parser-finish-error.js b/test/parallel/test-http-parser-finish-error.js
new file mode 100644
index 00000000000000..96cc60b90e6260
--- /dev/null
+++ b/test/parallel/test-http-parser-finish-error.js
@@ -0,0 +1,28 @@
+'use strict';
+
+const common = require('../common');
+const net = require('net');
+const http = require('http');
+const assert = require('assert');
+
+const str = 'GET / HTTP/1.1\r\n' +
+            'Content-Length:';
+
+
+const server = http.createServer(common.mustNotCall());
+server.on('clientError', common.mustCall((err, socket) => {
+  assert(/^Parse Error/.test(err.message));
+  assert.strictEqual(err.code, 'HPE_INVALID_EOF_STATE');
+  server.close();
+  socket.destroy();
+}, 1));
+server.listen(0, () => {
+  const client = net.connect({ port: server.address().port }, () => {
+    client.on('data', common.mustNotCall());
+    client.on('end', common.mustCall(() => {
+      server.close();
+    }));
+    client.write(str);
+    client.end();
+  });
+});

From dc7beec6103fc3b7412e081fdd94e1a0a75364ae Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Sun, 2 Dec 2018 02:15:22 -0500
Subject: [PATCH 3/3] fix nit

---
 test/parallel/test-http-parser-finish-error.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/parallel/test-http-parser-finish-error.js b/test/parallel/test-http-parser-finish-error.js
index 96cc60b90e6260..6d47a762dc8bfa 100644
--- a/test/parallel/test-http-parser-finish-error.js
+++ b/test/parallel/test-http-parser-finish-error.js
@@ -13,7 +13,6 @@ const server = http.createServer(common.mustNotCall());
 server.on('clientError', common.mustCall((err, socket) => {
   assert(/^Parse Error/.test(err.message));
   assert.strictEqual(err.code, 'HPE_INVALID_EOF_STATE');
-  server.close();
   socket.destroy();
 }, 1));
 server.listen(0, () => {