mirror of https://github.com/status-im/consul.git
Merge pull request #2733 from hashicorp/revert-2731-update-cleanhttp
Revert "Updates go-cleanhttp to get better tuning for newer Go versions."
This commit is contained in:
commit
9944c00509
|
@ -3,7 +3,6 @@ package cleanhttp
|
|||
import (
|
||||
"net"
|
||||
"net/http"
|
||||
"runtime"
|
||||
"time"
|
||||
)
|
||||
|
||||
|
@ -23,15 +22,13 @@ func DefaultTransport() *http.Transport {
|
|||
func DefaultPooledTransport() *http.Transport {
|
||||
transport := &http.Transport{
|
||||
Proxy: http.ProxyFromEnvironment,
|
||||
DialContext: (&net.Dialer{
|
||||
Dial: (&net.Dialer{
|
||||
Timeout: 30 * time.Second,
|
||||
KeepAlive: 30 * time.Second,
|
||||
}).DialContext,
|
||||
MaxIdleConns: 100,
|
||||
IdleConnTimeout: 90 * time.Second,
|
||||
}).Dial,
|
||||
TLSHandshakeTimeout: 10 * time.Second,
|
||||
ExpectContinueTimeout: 1 * time.Second,
|
||||
MaxIdleConnsPerHost: runtime.GOMAXPROCS(0) + 1,
|
||||
DisableKeepAlives: false,
|
||||
MaxIdleConnsPerHost: 1,
|
||||
}
|
||||
return transport
|
||||
}
|
||||
|
|
|
@ -438,10 +438,10 @@
|
|||
"revisionTime": "2015-10-22T18:15:14Z"
|
||||
},
|
||||
{
|
||||
"checksumSHA1": "6ihdHMkDfFx/rJ1A36com2F6bQk=",
|
||||
"checksumSHA1": "Uzyon2091lmwacNsl1hCytjhHtg=",
|
||||
"path": "github.com/hashicorp/go-cleanhttp",
|
||||
"revision": "a45970658e51fea2c41445ff0f7e07106d007617",
|
||||
"revisionTime": "2017-02-11T00:33:01Z"
|
||||
"revision": "ad28ea4487f05916463e2423a55166280e8254b5",
|
||||
"revisionTime": "2016-04-07T17:41:26Z"
|
||||
},
|
||||
{
|
||||
"checksumSHA1": "jPxyofQxI1PRPq6LPc6VlcRn5fI=",
|
||||
|
|
Loading…
Reference in New Issue