From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Wed, 13 Jan 2016 04:51:08 +0000 (-0800)
Subject: net/http2: update bundled http2
X-Git-Tag: go1.6beta2~21
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=771da53958618108c8ea56a69412eaeaae79e0ae;p=gostls13.git

net/http2: update bundled http2

Update bundled http2 to git rev 76365a4 for https://golang.org/issue/18571

Fixes golang/go#13924

Change-Id: Ibb48cd6935b35d9965df70fb8761be5986d79ffc
Reviewed-on: https://go-review.googlesource.com/18591
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go
index 4be56f50c5..5f08857564 100644
--- a/src/net/http/h2_bundle.go
+++ b/src/net/http/h2_bundle.go
@@ -5038,7 +5038,7 @@ func (cc *http2ClientConn) streamByID(id uint32, andRemove bool) *http2clientStr
 	cc.mu.Lock()
 	defer cc.mu.Unlock()
 	cs := cc.streams[id]
-	if andRemove && cs != nil {
+	if andRemove && cs != nil && !cc.closed {
 		delete(cc.streams, id)
 		close(cs.done)
 	}