From e3149c7cb7381ad5c1009673df2495adb0f00f48 Mon Sep 17 00:00:00 2001
From: Andrew Thornton <art27@cantab.net>
Date: Thu, 19 Aug 2021 20:44:34 +0100
Subject: [PATCH] Return nil proxy function if proxy not enabled

Signed-off-by: Andrew Thornton <art27@cantab.net>
---
 modules/proxy/proxy.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/proxy/proxy.go b/modules/proxy/proxy.go
index 0ab6ed334193c..61730544b078b 100644
--- 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