add ProxyFromEnvironment if none set (#1096)

go-gitea · Mar 2, 2017 · 2f7dc28 · 2f7dc28
1 parent f3bf409
commit 2f7dc28
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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 {