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