http2: fix hanging of Http2ServerResponse's end method with no data

Fixes: nodejs#38258
pd4d10 · May 5, 2021 · ccf4ee4 · ccf4ee4
1 parent 26e318a
commit ccf4ee4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/internal/http2/compat.js b/lib/internal/http2/compat.js
@@ -757,9 +757,6 @@ class Http2ServerResponse extends Stream {
     if (chunk !== null && chunk !== undefined)
       this.write(chunk, encoding);
 
-    state.headRequest = stream.headRequest;
-    state.ending = true;
-
     if (typeof cb === 'function') {
       if (stream.writableEnded)
         this.once('finish', cb);
@@ -770,6 +767,9 @@ class Http2ServerResponse extends Stream {
     if (!stream.headersSent)
       this.writeHead(this[kState].statusCode);
 
+    state.headRequest = stream.headRequest;
+    state.ending = true;
+
     if (this[kState].closed || stream.destroyed)
       ReflectApply(onStreamCloseResponse, stream, []);
     else