From 948a0ed97ec4661f03cd346335f1d3d180f4c1ae Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 3 Sep 2021 22:04:52 +0100 Subject: [PATCH] Put net.Dialer literal back into godoc --- src/net/http/transport.go | 7 +++++-- src/net/http/transport_default_js.go | 2 +- src/net/http/transport_default_other.go | 7 +------ 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/net/http/transport.go b/src/net/http/transport.go index 812e5ce5bc..2572482f2c 100644 --- a/src/net/http/transport.go +++ b/src/net/http/transport.go @@ -41,8 +41,11 @@ import ( // as directed by the $HTTP_PROXY and $NO_PROXY (or $http_proxy and // $no_proxy) environment variables. var DefaultTransport RoundTripper = &Transport{ - Proxy: ProxyFromEnvironment, - DialContext: defaultTransportDialContext(), + Proxy: ProxyFromEnvironment, + DialContext: defaultTransportDialContext(&net.Dialer{ + Timeout: 30 * time.Second, + KeepAlive: 30 * time.Second, + }), ForceAttemptHTTP2: true, MaxIdleConns: 100, IdleConnTimeout: 90 * time.Second, diff --git a/src/net/http/transport_default_js.go b/src/net/http/transport_default_js.go index 8501ca16fc..c07d35ef86 100644 --- a/src/net/http/transport_default_js.go +++ b/src/net/http/transport_default_js.go @@ -12,6 +12,6 @@ import ( "net" ) -func defaultTransportDialContext() func(context.Context, string, string) (net.Conn, error) { +func defaultTransportDialContext(dialer *net.Dialer) func(context.Context, string, string) (net.Conn, error) { return nil } diff --git a/src/net/http/transport_default_other.go b/src/net/http/transport_default_other.go index f9e738d670..8a2f1cc42b 100644 --- a/src/net/http/transport_default_other.go +++ b/src/net/http/transport_default_other.go @@ -10,13 +10,8 @@ package http import ( "context" "net" - "time" ) -func defaultTransportDialContext() func(context.Context, string, string) (net.Conn, error) { - dialer := &net.Dialer{ - Timeout: 30 * time.Second, - KeepAlive: 30 * time.Second, - } +func defaultTransportDialContext(dialer *net.Dialer) func(context.Context, string, string) (net.Conn, error) { return dialer.DialContext }