diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-02 06:13:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-02 06:13:25 -0400 |
| commit | 00c7b493a0565205aa054be7708281874163c85d (patch) | |
| tree | ef43b932450ef34f26ae3b8d1dda53aab752c760 /vendor/google.golang.org/appengine | |
| parent | 0b7b22243798650841cd9b790809a0a482f4cbcb (diff) | |
| parent | 5aead1509c681de533b8966e781e15327fe35ab6 (diff) | |
| download | podman-00c7b493a0565205aa054be7708281874163c85d.tar.gz podman-00c7b493a0565205aa054be7708281874163c85d.tar.bz2 podman-00c7b493a0565205aa054be7708281874163c85d.zip | |
Merge pull request #7815 from jwhonce/wip/creds_remote
Add X-Registry-Config support
Diffstat (limited to 'vendor/google.golang.org/appengine')
| -rw-r--r-- | vendor/google.golang.org/appengine/internal/api.go | 7 | ||||
| -rw-r--r-- | vendor/google.golang.org/appengine/internal/net.go | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/vendor/google.golang.org/appengine/internal/api.go b/vendor/google.golang.org/appengine/internal/api.go index a6ec19e14..721053c20 100644 --- a/vendor/google.golang.org/appengine/internal/api.go +++ b/vendor/google.golang.org/appengine/internal/api.go @@ -58,8 +58,11 @@ var ( apiHTTPClient = &http.Client{ Transport: &http.Transport{ - Proxy: http.ProxyFromEnvironment, - Dial: limitDial, + Proxy: http.ProxyFromEnvironment, + Dial: limitDial, + MaxIdleConns: 1000, + MaxIdleConnsPerHost: 10000, + IdleConnTimeout: 90 * time.Second, }, } diff --git a/vendor/google.golang.org/appengine/internal/net.go b/vendor/google.golang.org/appengine/internal/net.go index 3b94cf0c6..fe429720e 100644 --- a/vendor/google.golang.org/appengine/internal/net.go +++ b/vendor/google.golang.org/appengine/internal/net.go @@ -32,7 +32,7 @@ func limitDial(network, addr string) (net.Conn, error) { // Dial with a timeout in case the API host is MIA. // The connection should normally be very fast. - conn, err := net.DialTimeout(network, addr, 500*time.Millisecond) + conn, err := net.DialTimeout(network, addr, 10*time.Second) if err != nil { limitRelease() return nil, err |