luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

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:
James Phillips 2017-02-10 17:13:10 -08:00 committed by GitHub
parent 32c6007220 a5028e833e
commit 0b3a09a551
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vendor/github.com/hashicorp/go-cleanhttp/cleanhttp.go generated vendored
View File

@ -3,7 +3,6 @@ package cleanhttp
import ( import (
"net" "net"
"net/http" "net/http"
"runtime"
"time" "time"
) )
@ -23,15 +22,13 @@ func DefaultTransport() *http.Transport {
func DefaultPooledTransport() *http.Transport { func DefaultPooledTransport() *http.Transport {
transport := &http.Transport{ transport := &http.Transport{
Proxy: http.ProxyFromEnvironment, Proxy: http.ProxyFromEnvironment,
DialContext: (&net.Dialer{ Dial: (&net.Dialer{
Timeout: 30 * time.Second, Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second, KeepAlive: 30 * time.Second,
}).DialContext, }).Dial,
MaxIdleConns: 100, TLSHandshakeTimeout: 10 * time.Second,
IdleConnTimeout: 90 * time.Second, DisableKeepAlives: false,
TLSHandshakeTimeout: 10 * time.Second, MaxIdleConnsPerHost: 1,
ExpectContinueTimeout: 1 * time.Second,
MaxIdleConnsPerHost: runtime.GOMAXPROCS(0) + 1,
} }
return transport return transport
} }

6
vendor/vendor.json vendored
View File

@ -438,10 +438,10 @@
"revisionTime": "2015-10-22T18:15:14Z" "revisionTime": "2015-10-22T18:15:14Z"
}, },
{ {
"checksumSHA1": "6ihdHMkDfFx/rJ1A36com2F6bQk=", "checksumSHA1": "Uzyon2091lmwacNsl1hCytjhHtg=",
"path": "github.com/hashicorp/go-cleanhttp", "path": "github.com/hashicorp/go-cleanhttp",
"revision": "a45970658e51fea2c41445ff0f7e07106d007617", "revision": "ad28ea4487f05916463e2423a55166280e8254b5",
"revisionTime": "2017-02-11T00:33:01Z" "revisionTime": "2016-04-07T17:41:26Z"
}, },
{ {
"checksumSHA1": "jPxyofQxI1PRPq6LPc6VlcRn5fI=", "checksumSHA1": "jPxyofQxI1PRPq6LPc6VlcRn5fI=",