aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@golang.org>2016-01-12 20:51:08 -0800
committerBrad Fitzpatrick <bradfitz@golang.org>2016-01-13 04:52:24 +0000
commit771da53958618108c8ea56a69412eaeaae79e0ae (patch)
treefb13146687c3ea5d6ab68619a96cbebb6948df5e
parent4ffba768555a14fe2730af27a4508ccd21eef65b (diff)
downloadgo-771da53958618108c8ea56a69412eaeaae79e0ae.tar.gz
go-771da53958618108c8ea56a69412eaeaae79e0ae.zip
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>
-rw-r--r--src/net/http/h2_bundle.go2
1 files changed, 1 insertions, 1 deletions
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)
}