Return nil proxy function if proxy not enabled (#16742)

Signed-off-by: Andrew Thornton <art27@cantab.net>

diff --git a/modules/proxy/proxy.go b/modules/proxy/proxy.go
index 0ab6ed334193cd493e16aea895716e07867e6702..61730544b078bbd07cb47775451ac16447944c2b 100644 (file)
--- a/modules/proxy/proxy.go
+++ b/modules/proxy/proxy.go
@@ -56,7 +56,9 @@ func Match(u string) bool {
 // Proxy returns the system proxy
 func Proxy() func(req *http.Request) (*url.URL, error) {
        if !setting.Proxy.Enabled {
-               return nil
+               return func(req *http.Request) (*url.URL, error) {
+                       return nil, nil
+               }
        }
        if setting.Proxy.ProxyURL == "" {
                return http.ProxyFromEnvironment