http2: always call callback on Http2ServerResponse#end

Fixes: #28001 PR-URL: #33911 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Denys Otrishko <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
nodejs · Jul 10, 2020 · c60ffe6 · c60ffe6
1 parent b5f0fdb
commit c60ffe6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/lib/internal/http2/compat.js b/lib/internal/http2/compat.js
@@ -698,11 +698,6 @@ class Http2ServerResponse extends Stream {
     const stream = this[kStream];
     const state = this[kState];
 
-    if ((state.closed || state.ending) &&
-        state.headRequest === stream.headRequest) {
-      return this;
-    }
-
     if (typeof chunk === 'function') {
       cb = chunk;
       chunk = null;
@@ -711,6 +706,14 @@ class Http2ServerResponse extends Stream {
       encoding = 'utf8';
     }
 
+    if ((state.closed || state.ending) &&
+        state.headRequest === stream.headRequest) {
+      if (typeof cb === 'function') {
+        process.nextTick(cb);
+      }
+      return this;
+    }
+
     if (chunk !== null && chunk !== undefined)
       this.write(chunk, encoding);
 

diff --git a/test/parallel/test-http2-compat-serverresponse-end.js b/test/parallel/test-http2-compat-serverresponse-end.js
@@ -25,16 +25,16 @@ const {
   // but callback will only be called once
   const server = createServer(mustCall((request, response) => {
     response.end('end', 'utf8', mustCall(() => {
-      response.end(mustNotCall());
+      response.end(mustCall());
       process.nextTick(() => {
-        response.end(mustNotCall());
+        response.end(mustCall());
         server.close();
       });
     }));
     response.on('finish', mustCall(() => {
-      response.end(mustNotCall());
+      response.end(mustCall());
     }));
-    response.end(mustNotCall());
+    response.end(mustCall());
   }));
   server.listen(0, mustCall(() => {
     let data = '';
@@ -294,7 +294,7 @@ const {
     }));
     response.end('data', mustCall(() => {
       strictEqual(finished, false);
-      response.end('data', mustNotCall());
+      response.end('data', mustCall());
     }));
   }));
   server.listen(0, mustCall(() => {
@@ -328,7 +328,7 @@ const {
   // Should be able to respond to HEAD with just .end
   const server = createServer(mustCall((request, response) => {
     response.end('data', mustCall());
-    response.end(mustNotCall());
+    response.end(mustCall());
   }));
   server.listen(0, mustCall(() => {
     const { port } = server.address();