summaryrefslogtreecommitdiff
path: root/vendor/github.com/docker/go-connections/sockets/sockets.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2022-02-04 09:44:39 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2022-02-04 09:44:39 -0500
commite47a3bec91f65a47a7455f3d970b4ba443565663 (patch)
treec33349bcd36ce3a6ec8902f5c753d91d77873d8e /vendor/github.com/docker/go-connections/sockets/sockets.go
parent4ad9e0030bc20826f735cf4ec0d5ecc287647218 (diff)
downloadpodman-e47a3bec91f65a47a7455f3d970b4ba443565663.tar.gz
podman-e47a3bec91f65a47a7455f3d970b4ba443565663.tar.bz2
podman-e47a3bec91f65a47a7455f3d970b4ba443565663.zip
Vendor in 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.go12
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
}