From 2f7dc28b22f039b04aa200ee0909bf889d86e66e Mon Sep 17 00:00:00 2001
From: Schwobaland <Schwobaland@users.noreply.github.com>
Date: Thu, 2 Mar 2017 01:36:42 +0100
Subject: [PATCH] add ProxyFromEnvironment if none set (#1096)

---
 modules/httplib/httplib.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/httplib/httplib.go b/modules/httplib/httplib.go
index c4e613f765..981de2f6d9 100644
--- 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 {