Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4830 from mischief/proxy-env

Browse Source 
pkg/transport: use ProxyFromEnvironment when constructing a transport
This commit is contained in:
Nick Owens 2016-03-22 01:14:03 -07:00
commit a054ae320b
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/transport/listener.go
View File

@ -67,6 +67,7 @@ func NewTransport(info TLSInfo, dialtimeoutd time.Duration) (*http.Transport, er
} }
t := &http.Transport{ t := &http.Transport{
Proxy: http.ProxyFromEnvironment,
Dial: (&net.Dialer{ Dial: (&net.Dialer{
Timeout: dialtimeoutd, Timeout: dialtimeoutd,
// value taken from http.DefaultTransport // value taken from http.DefaultTransport