diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2022-02-03 18:33:22 -0500 |
---|---|---|
committer | Daniel J Walsh <dwalsh@redhat.com> | 2022-02-03 18:33:22 -0500 |
commit | 1d1b2b1509646e07ab4a984c7622fa002a0fcdb7 (patch) | |
tree | fd4078e58bc9ab0b6c2ef1938017ce5844f97744 /vendor/github.com/docker/go-connections/sockets/sockets.go | |
parent | 608b6142edb7a4e179ce6d2ae69707be28f29359 (diff) | |
download | podman-1d1b2b1509646e07ab4a984c7622fa002a0fcdb7.tar.gz podman-1d1b2b1509646e07ab4a984c7622fa002a0fcdb7.tar.bz2 podman-1d1b2b1509646e07ab4a984c7622fa002a0fcdb7.zip |
Update containers/buildah v1.24.1
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/github.com/docker/go-connections/sockets/sockets.go')
-rw-r--r-- | vendor/github.com/docker/go-connections/sockets/sockets.go | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/vendor/github.com/docker/go-connections/sockets/sockets.go b/vendor/github.com/docker/go-connections/sockets/sockets.go index a1d7beb4d..2e9e9006f 100644 --- a/vendor/github.com/docker/go-connections/sockets/sockets.go +++ b/vendor/github.com/docker/go-connections/sockets/sockets.go @@ -3,14 +3,9 @@ package sockets import ( "errors" - "net" "net/http" - "time" ) -// Why 32? See https://github.com/docker/docker/pull/8035. -const defaultTimeout = 32 * time.Second - // ErrProtocolNotAvailable is returned when a given transport protocol is not provided by the operating system. var ErrProtocolNotAvailable = errors.New("protocol not available") @@ -26,13 +21,6 @@ func ConfigureTransport(tr *http.Transport, proto, addr string) error { return configureNpipeTransport(tr, proto, addr) default: tr.Proxy = http.ProxyFromEnvironment - dialer, err := DialerFromEnvironment(&net.Dialer{ - Timeout: defaultTimeout, - }) - if err != nil { - return err - } - tr.Dial = dialer.Dial } return nil } |