Browse Source

add ProxyFromEnvironment if none set (#1096)

tags/v1.1.0
Schwobaland 7 years ago
parent
commit
2f7dc28b22
1 changed files with 5 additions and 1 deletions
  1. 5
    1
      modules/httplib/httplib.go

+ 5
- 1
modules/httplib/httplib.go View File

@@ -303,9 +303,13 @@ func (r *Request) getResponse() (*http.Response, error) {

if trans == nil {
// create default transport
proxy := r.setting.Proxy
if proxy == nil {
proxy = http.ProxyFromEnvironment
}
trans = &http.Transport{
TLSClientConfig: r.setting.TLSClientConfig,
Proxy: r.setting.Proxy,
Proxy: proxy,
Dial: TimeoutDialer(r.setting.ConnectTimeout, r.setting.ReadWriteTimeout),
}
} else {

Loading…
Cancel
Save