add ProxyFromEnvironment if none set (#1096)

2017-03-02 01:36:42 +01:00 · 2017-03-02 01:36:42 +01:00 · 2f7dc28b22
parent f3bf409082
commit 2f7dc28b22
1 changed files with 5 additions and 1 deletions
--- a/modules/httplib/httplib.go
+++ b/modules/httplib/httplib.go
@ -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 {