[internal-branch.go1.17-vendor] http2: on write errors, close ClientC…

…onn before returning from RoundTrip Deflakes TestTransportRoundtripCloseOnWriteError. Updates golang/go#49077 Change-Id: I4384d9091d55307d15fbd44b1b8137dcc8939c86 Reviewed-on: https://go-review.googlesource.com/c/net/+/356029 Trust: Damien Neil <[email protected]> Run-TryBot: Damien Neil <[email protected]> Reviewed-by: Brad Fitzpatrick <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-on: https://go-review.googlesource.com/c/net/+/357692 Reviewed-by: Dmitri Shuralyov <[email protected]>
fedosgad · Oct 29, 2021 · 94843a4 · 94843a4
1 parent 875be97
commit 94843a4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/transport.go b/transport.go
@@ -1328,14 +1328,15 @@ func (cs *clientStream) cleanupWriteRequest(err error) {
 	if cs.ID != 0 {
 		cc.forgetStreamID(cs.ID)
 	}
-	close(cs.donec)
 
 	cc.wmu.Lock()
 	werr := cc.werr
 	cc.wmu.Unlock()
 	if werr != nil {
 		cc.Close()
 	}
+
+	close(cs.donec)
 }
 
 // awaitOpenSlotForStream waits until len(streams) < maxConcurrentStreams.