Skip to content

Commit 2f744fa

Browse files
neilddmitshur
authored andcommitted
[internal-branch.go1.16-vendor] http2: on write errors, close ClientConn before returning from RoundTrip
Deflakes TestTransportRoundtripCloseOnWriteError. Updates golang/go#49076 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/+/357097 Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 275be3f commit 2f744fa

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

http2/transport.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1332,14 +1332,15 @@ func (cs *clientStream) cleanupWriteRequest(err error) {
13321332
if cs.ID != 0 {
13331333
cc.forgetStreamID(cs.ID)
13341334
}
1335-
close(cs.donec)
13361335

13371336
cc.wmu.Lock()
13381337
werr := cc.werr
13391338
cc.wmu.Unlock()
13401339
if werr != nil {
13411340
cc.Close()
13421341
}
1342+
1343+
close(cs.donec)
13431344
}
13441345

13451346
// awaitOpenSlotForStream waits until len(streams) < maxConcurrentStreams.

0 commit comments

Comments
 (0)