X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4ed6626cfba06e924f77dc54e1fe704eff1d113c..678f1f53466c3f2133f63a6e6ad553f5e5d14804:/sdk/go/keepclient/keepclient.go

diff --git a/sdk/go/keepclient/keepclient.go b/sdk/go/keepclient/keepclient.go
index 6a3e83796e..c8dd09de86 100644
--- a/sdk/go/keepclient/keepclient.go
+++ b/sdk/go/keepclient/keepclient.go
@@ -546,31 +546,26 @@ func (kc *KeepClient) httpClient() HTTPClient {
 		keepAlive = DefaultKeepAlive
 	}
 
-	transport, ok := http.DefaultTransport.(*http.Transport)
-	if ok {
-		copy := *transport
-		transport = &copy
-	} else {
-		// Evidently the application has replaced
-		// http.DefaultTransport with a different type, so we
-		// need to build our own from scratch using the Go 1.8
-		// defaults.
-		transport = &http.Transport{
+	c := &http.Client{
+		Timeout: requestTimeout,
+		// It's not safe to copy *http.DefaultTransport
+		// because it has a mutex (which might be locked)
+		// protecting a private map (which might not be nil).
+		// So we build our own, using the Go 1.12 default
+		// values, ignoring any changes the application has
+		// made to http.DefaultTransport.
+		Transport: &http.Transport{
+			DialContext: (&net.Dialer{
+				Timeout:   connectTimeout,
+				KeepAlive: keepAlive,
+				DualStack: true,
+			}).DialContext,
 			MaxIdleConns:          100,
 			IdleConnTimeout:       90 * time.Second,
-			ExpectContinueTimeout: time.Second,
-		}
-	}
-	transport.DialContext = (&net.Dialer{
-		Timeout:   connectTimeout,
-		KeepAlive: keepAlive,
-		DualStack: true,
-	}).DialContext
-	transport.TLSHandshakeTimeout = tlsTimeout
-	transport.TLSClientConfig = arvadosclient.MakeTLSConfig(kc.Arvados.ApiInsecure)
-	c := &http.Client{
-		Timeout:   requestTimeout,
-		Transport: transport,
+			TLSHandshakeTimeout:   tlsTimeout,
+			ExpectContinueTimeout: 1 * time.Second,
+			TLSClientConfig:       arvadosclient.MakeTLSConfig(kc.Arvados.ApiInsecure),
+		},
 	}
 	defaultClient[kc.Arvados.ApiInsecure][kc.foundNonDiskSvc] = c
 	return c