Ensure trailers get the END_STREAM flag. Release v3.3.8.

molnarg · Feb 16, 2018 · c0fde18 · c0fde18
1 parent f3189f3
commit c0fde18
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,6 +1,9 @@
 Version history
 ===============
 
+### 3.3.8 (2018-02-15) ###
+* Fix an issue with HTTP trailers and END_STREAM.
+
 ### 3.3.7 (2017-09-21) ###
 * Mark as incompatible with node >= 9.0.0 (to encourage using the built-in http2 module available by default in node >= 9.0.0).
 

diff --git a/lib/http.js b/lib/http.js
@@ -345,7 +345,7 @@ OutgoingMessage.prototype._finish = function _finish() {
       if (this.request) {
         this.request.addTrailers(this._trailers);
       } else {
-        this.stream.headers(this._trailers);
+        this.stream.trailers(this._trailers);
       }
     }
     this.finished = true;

diff --git a/lib/protocol/stream.js b/lib/protocol/stream.js
@@ -62,6 +62,7 @@ function Stream(log, connection) {
   this._initializeState();
 
   this.connection = connection;
+  this.sentEndStream = false;
 }
 
 Stream.prototype = Object.create(Duplex.prototype, { constructor: { value: Stream } });
@@ -106,6 +107,16 @@ Stream.prototype.headers = function headers(headers) {
   });
 };
 
+Stream.prototype.trailers = function trailers(trailers) {
+  this.sentEndStream = true;
+  this._pushUpstream({
+    type: 'HEADERS',
+    flags: {'END_STREAM': true},
+    stream: this.id,
+    headers: trailers
+  });
+};
+
 Stream.prototype._onHeaders = function _onHeaders(frame) {
   if (frame.priority !== undefined) {
     this.priority(frame.priority, true);
@@ -342,6 +353,13 @@ Stream.prototype._finishing = function _finishing() {
     stream: this.id,
     data: emptyBuffer
   };
+
+  if (this.sentEndStream) {
+    this._log.debug('Already sent END_STREAM, not sending again.');
+    return;
+  }
+
+  this.sentEndStream = true;
   var lastFrame = this.upstream.getLastQueuedFrame();
   if (lastFrame && ((lastFrame.type === 'DATA') || (lastFrame.type === 'HEADERS'))) {
     this._log.debug({ frame: lastFrame }, 'Marking last frame with END_STREAM flag.');

diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "http2",
-  "version": "3.3.7",
+  "version": "3.3.8",
   "description": "An HTTP/2 client and server implementation",
   "main": "lib/index.js",
-  "engines" : {
-    "node" : ">=0.12.0 <9.0.0"
+  "engines": {
+    "node": ">=0.12.0 <9.0.0"
   },
   "devDependencies": {
     "istanbul": "*",