TRKJ/gitea
2
0
Fork 0
mirror of https://gitee.com/gitea/gitea synced 2025-11-04 16:40:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

add ProxyFromEnvironment if none set (#1096)

Browse Source
This commit is contained in:
Schwobaland
2017-03-02 01:36:42 +01:00
committed by Lunny Xiao
parent f3bf409082
commit 2f7dc28b22
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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 {