From 143365329d8ad7ff4d6f8a5ca1fbe274bc16a2cb Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Thu, 13 Sep 2018 09:31:48 -0700
Subject: [PATCH] http2: add http2stream.endAfterHeaders property

Indicates is the END_STREAM flag was set on the received HEADERS frame

PR-URL: https://github.com/nodejs/node/pull/22843
Fixes: https://github.com/nodejs/node/issues/22497
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 doc/api/http2.md                            | 11 +++++
 lib/internal/http2/core.js                  |  9 +++-
 test/parallel/test-http2-endafterheaders.js | 50 +++++++++++++++++++++
 3 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 test/parallel/test-http2-endafterheaders.js

diff --git a/doc/api/http2.md b/doc/api/http2.md
index 7aec57e1111291..feeb66aa88c108 100644
--- a/doc/api/http2.md
+++ b/doc/api/http2.md
@@ -958,6 +958,17 @@ added: v8.4.0
 Set to `true` if the `Http2Stream` instance has been destroyed and is no longer
 usable.
 
+#### http2stream.endAfterHeaders
+<!-- YAML
+added: REPLACEME
+-->
+
+* {boolean}
+
+Set the `true` if the `END_STREAM` flag was set in the request or response
+HEADERS frame received, indicating that no additional data should be received
+and the readable side of the `Http2Stream` will be closed.
+
 #### http2stream.pending
 <!-- YAML
 added: v9.4.0
diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
index 9c476ac5f3289d..e778402c42ef35 100644
--- a/lib/internal/http2/core.js
+++ b/lib/internal/http2/core.js
@@ -276,6 +276,8 @@ function onSessionHeaders(handle, id, cat, flags, headers) {
     } else {
       stream = new ClientHttp2Stream(session, handle, id, opts);
     }
+    if (endOfStream)
+      stream[kState].endAfterHeaders = true;
     process.nextTick(emit, session, 'stream', stream, obj, flags, headers);
   } else {
     let event;
@@ -1548,7 +1550,8 @@ class Http2Stream extends Duplex {
       flags: STREAM_FLAGS_PENDING,
       rstCode: NGHTTP2_NO_ERROR,
       writeQueueSize: 0,
-      trailersReady: false
+      trailersReady: false,
+      endAfterHeaders: false
     };
 
     this.on('pause', streamOnPause);
@@ -1594,6 +1597,10 @@ class Http2Stream extends Duplex {
     return `Http2Stream ${util.format(obj)}`;
   }
 
+  get endAfterHeaders() {
+    return this[kState].endAfterHeaders;
+  }
+
   get sentHeaders() {
     return this[kSentHeaders];
   }
diff --git a/test/parallel/test-http2-endafterheaders.js b/test/parallel/test-http2-endafterheaders.js
new file mode 100644
index 00000000000000..429ffc3188452d
--- /dev/null
+++ b/test/parallel/test-http2-endafterheaders.js
@@ -0,0 +1,50 @@
+'use strict';
+
+const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+const assert = require('assert');
+const http2 = require('http2');
+const Countdown = require('../common/countdown');
+
+const server = http2.createServer();
+server.on('stream', common.mustCall((stream, headers) => {
+  const check = headers[':method'] === 'GET' ? true : false;
+  assert.strictEqual(stream.endAfterHeaders, check);
+  stream.on('data', common.mustNotCall());
+  stream.on('end', common.mustCall());
+  stream.respond();
+  stream.end('ok');
+}, 2));
+
+const countdown = new Countdown(2, () => server.close());
+
+server.listen(0, common.mustCall(() => {
+  {
+    const client = http2.connect(`http://localhost:${server.address().port}`);
+    const req = client.request();
+
+    req.resume();
+    req.on('response', common.mustCall(() => {
+      assert.strictEqual(req.endAfterHeaders, false);
+    }));
+    req.on('end', common.mustCall(() => {
+      client.close();
+      countdown.dec();
+    }));
+  }
+  {
+    const client = http2.connect(`http://localhost:${server.address().port}`);
+    const req = client.request({ ':method': 'POST' });
+
+    req.resume();
+    req.end();
+    req.on('response', common.mustCall(() => {
+      assert.strictEqual(req.endAfterHeaders, false);
+    }));
+    req.on('end', common.mustCall(() => {
+      client.close();
+      countdown.dec();
+    }));
+  }
+}));