From 9e81bd5c9b776e77d7b63f2a8369634d202459b5 Mon Sep 17 00:00:00 2001
From: Simon Tretter <simllll@users.noreply.github.com>
Date: Thu, 20 Oct 2016 02:09:38 +0200
Subject: [PATCH 1/2] Update connection.js

---
 lib/protocol/connection.js | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/lib/protocol/connection.js b/lib/protocol/connection.js
index 2b86b7f..8aa313d 100644
--- a/lib/protocol/connection.js
+++ b/lib/protocol/connection.js
@@ -214,6 +214,11 @@ Connection.prototype._insert = function _insert(stream, priority) {
 };
 
 Connection.prototype._reprioritize = function _reprioritize(stream, priority) {
+  this._removePrioritisedStream(stream);
+  this._insert(stream, priority);
+};
+
+Connection.prototype._removePrioritisedStream = function _removePrioritisedStream(stream) {
   var bucket = this._streamPriorities[stream._priority];
   var index = bucket.indexOf(stream);
   assert(index !== -1);
@@ -221,8 +226,6 @@ Connection.prototype._reprioritize = function _reprioritize(stream, priority) {
   if (bucket.length === 0) {
     delete this._streamPriorities[stream._priority];
   }
-
-  this._insert(stream, priority);
 };
 
 // Creating an *inbound* stream with the given ID. It is called when there's an incoming frame to
@@ -246,9 +249,18 @@ Connection.prototype.createStream = function createStream() {
   var stream = new Stream(this._log, this);
   this._allocatePriority(stream);
 
+  stream.on('end', this._removeStream.bind(this, stream));
+
   return stream;
 };
 
+Connection.prototype._removeStream = function _removeStream(stream) {
+  this._log.trace('Removing outbound stream.');
+
+  delete this._streamIds[stream.id];
+  this._removePrioritisedStream(stream);
+};
+
 // Multiplexing
 // ------------
 
@@ -290,7 +302,7 @@ priority_loop:
     //   2. if there's no frame, skip this stream
     //   3. if forwarding this frame would make `streamCount` greater than `streamLimit`, skip
     //      this stream
-    //   4. adding stream to the bucket of the next round
+    //   4. adding stream to the bucket of the next round unless it has ended
     //   5. assigning an ID to the frame (allocating an ID to the stream if there isn't already)
     //   6. if forwarding a PUSH_PROMISE, allocate ID to the promised stream
     //   7. forwarding the frame, changing `streamCount` as appropriate
@@ -308,7 +320,11 @@ priority_loop:
           continue;
         }
 
-        nextBucket.push(stream);
+        if (!stream._ended) {
+          nextBucket.push(stream);
+        } else {
+          delete this._streamIds[stream.id];
+        }
 
         if (frame.stream === undefined) {
           frame.stream = stream.id || this._allocateId(stream);

From 542166028c400fef935004e07ffc4924763383b9 Mon Sep 17 00:00:00 2001
From: Simon Tretter <simllll@users.noreply.github.com>
Date: Thu, 20 Oct 2016 09:38:51 +0200
Subject: [PATCH 2/2] Update connection.js

---
 lib/protocol/connection.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/protocol/connection.js b/lib/protocol/connection.js
index 8aa313d..75012e9 100644
--- a/lib/protocol/connection.js
+++ b/lib/protocol/connection.js
@@ -311,6 +311,7 @@ priority_loop:
     while (bucket.length > 0) {
       for (var index = 0; index < bucket.length; index++) {
         var stream = bucket[index];
+        if(!stream || !stream.upstream) continue;
         var frame = stream.upstream.read((this._window > 0) ? this._window : -1);
 
         if (!frame) {