H2 transport: Abandon client if client.Do(request) failed

See golang/go#30702 Fixes XTLS#2355
computerscot · Jul 21, 2023 · 51769fd · 51769fd
1 parent e603b97
commit 51769fd
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/transport/internet/http/dialer.go b/transport/internet/http/dialer.go
@@ -173,6 +173,15 @@ func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.Me
 		if err != nil {
 			newError("failed to dial to ", dest).Base(err).AtWarning().WriteToLog(session.ExportIDToError(ctx))
 			wrc.Close()
+			{
+				// Abandon `client` if `client.Do(request)` failed
+				// See https://github.com/golang/go/issues/30702
+				globalDialerAccess.Lock()
+				if globalDialerMap[dialerConf{dest, streamSettings}] == client {
+					delete(globalDialerMap, dialerConf{dest, streamSettings})
+				}
+				globalDialerAccess.Unlock()
+			}
 			return
 		}
 		if response.StatusCode != 200 {