diff options
| author | Joffrey F <joffrey@docker.com> | 2014-06-07 21:01:13 +0200 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2014-06-07 21:02:48 +0200 |
| commit | 031e738673ac7c8ab157aef465239f759b14f616 (patch) | |
| tree | 2d3b8140743382478afbe2db0389b9a06f17adc0 | |
| parent | f7e4546af0daac44deaf59110529ebda483005fb (diff) | |
| download | docker-fix_registry_pushes.tar.gz | |
Remove custom http dial (causes push that take over 1 minute to fail)fix_registry_pushes
Docker-DCO-1.1-Signed-off-by: Joffrey F <joffrey@docker.com> (github: shin-)
| -rw-r--r-- | registry/registry.go | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/registry/registry.go b/registry/registry.go index 8d1a9f2287..78581069d6 100644 --- a/registry/registry.go +++ b/registry/registry.go @@ -791,17 +791,7 @@ func AddRequiredHeadersToRedirectedRequests(req *http.Request, via []*http.Reque } func NewRegistry(authConfig *AuthConfig, factory *utils.HTTPRequestFactory, indexEndpoint string) (r *Registry, err error) { - httpDial := func(proto string, addr string) (net.Conn, error) { - conn, err := net.Dial(proto, addr) - if err != nil { - return nil, err - } - conn = utils.NewTimeoutConn(conn, time.Duration(1)*time.Minute) - return conn, nil - } - httpTransport := &http.Transport{ - Dial: httpDial, DisableKeepAlives: true, Proxy: http.ProxyFromEnvironment, } |
