p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

handle GET redirects

Browse Source 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 4b4ad26b977bba0b52f6ea15d08750a7453304a4
Component: engine
This commit is contained in:
Victor Vieux
2014-10-08 18:18:42 +00:00
parent 30c8fd82ed
commit f37e910c9f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/engine/api/client/cli.go
View File

@ -138,14 +138,17 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, key libtrust.PrivateKey,
// The transport is created here for reuse during the client session
tr := &http.Transport{
TLSClientConfig: tlsConfig,
Dial: func(dial_network, dial_addr string) (net.Conn, error) {
// Why 32? See issue 8035
return net.DialTimeout(proto, addr, 32*time.Second)
},
}
// Why 32? See issue 8035
if proto == "unix" {
// no need in compressing for local communications
tr.DisableCompression = true
tr.Dial = func(network, addr string) (net.Conn, error) {
return net.DialTimeout("unix", addr, 32*time.Second)
}
} else {
tr.Dial = (&net.Dialer{Timeout: 32 * time.Second}).Dial
}
return &DockerCli{