meta: merge node/master into node-chakracore/master

Merge 32fed93 as of 2018-12-03
This commit was automatically generated. For any problems, please contact jackhorton

Reviewed-By: Taylor Woll <tawoll@ntdev.microsoft.com>

Author: chakrabot

lib/internal/http2/compat.js

@@ -568,6 +568,11 @@ class Http2ServerResponse extends Stream {
     if (this[kStream].headersSent)
       throw new ERR_HTTP2_HEADERS_SENT();
 
+    // If the stream is destroyed, we return false,
+    // like require('http').
+    if (this.stream.destroyed)
+      return false;
+
     if (typeof statusMessage === 'string')
       statusMessageWarn();
 

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);
   }
 

test/parallel/test-http-parser-finish-error.js

@@ -0,0 +1,27 @@
+'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');
+  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();
+  });
+});

test/parallel/test-http2-compat-write-head-destroyed.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+const http2 = require('http2');
+
+// Check that writeHead, write and end do not crash in compatibility mode
+
+const server = http2.createServer(common.mustCall((req, res) => {
+  // destroy the stream first
+  req.stream.destroy();
+
+  res.writeHead(200);
+  res.write('hello ');
+  res.end('world');
+}));
+
+server.listen(0, common.mustCall(() => {
+  const client = http2.connect(`http://localhost:${server.address().port}`);
+
+  const req = client.request();
+  req.on('response', common.mustNotCall());
+  req.on('close', common.mustCall((arg) => {
+    client.close();
+    server.close();
+  }));
+  req.resume();
+}));