Return nil proxy function if proxy not enabled (#16742)
Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
parent
4debb74eda
commit
03937891e2
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user