From b6e83f35daaa8ce0dfae3e5f93c78d0cb344a2b0 Mon Sep 17 00:00:00 2001 From: "Bryan C. Mills" Date: Wed, 20 Sep 2023 10:44:06 -0400 Subject: [PATCH] net/http: eliminate a goroutine leak in (*persistConn.addTLS) In case of a handshake timeout, the goroutine running addTLS closes the underlying connection, which should unblock the call to tlsConn.HandshakeContext. However, it didn't then wait for HandshakeContext to actually return. I thought this might have something to do with #57602, but as far as I can tell it does not. Still, it seems best to avoid the leak: if tracing is enabled we emit a TLSHandshakeDone event, and it seems misleading to produce that event when the handshake is still in progress. For #57602. Change-Id: Ibfc0cf4ef8df2ccf11d8897f23d7d79ee482d5fb Reviewed-on: https://go-review.googlesource.com/c/go/+/529755 LUCI-TryBot-Result: Go LUCI Reviewed-by: Damien Neil Auto-Submit: Bryan Mills Commit-Queue: Bryan Mills --- src/net/http/transport.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/net/http/transport.go b/src/net/http/transport.go index ac7477ea1d..1cf41a5474 100644 --- a/src/net/http/transport.go +++ b/src/net/http/transport.go @@ -1577,6 +1577,11 @@ func (pconn *persistConn) addTLS(ctx context.Context, name string, trace *httptr }() if err := <-errc; err != nil { plainConn.Close() + if err == (tlsHandshakeTimeoutError{}) { + // Now that we have closed the connection, + // wait for the call to HandshakeContext to return. + <-errc + } if trace != nil && trace.TLSHandshakeDone != nil { trace.TLSHandshakeDone(tls.ConnectionState{}, err) } -- 2.48.1