kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #9108 from vieux/handle_redirects

Browse source 
handle GET redirects over HTTP
This commit is contained in:
Michael Crosby 2014-11-14 12:07:22 -08:00
commit df603eb4e4
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
api/client/cli.go
View file

@ -138,14 +138,18 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, key libtrust.PrivateKey,
// The transport is created here for reuse during the client session // The transport is created here for reuse during the client session
tr := &http.Transport{ tr := &http.Transport{
TLSClientConfig: tlsConfig, 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
timeout := 32 * time.Second
if proto == "unix" { if proto == "unix" {
// no need in compressing for local communications // no need in compressing for local communications
tr.DisableCompression = true tr.DisableCompression = true
tr.Dial = func(_, _ string) (net.Conn, error) {
return net.DialTimeout(proto, addr, timeout)
}
} else {
tr.Dial = (&net.Dialer{Timeout: timeout}).Dial
} }
return &DockerCli{ return &DockerCli{