MirrorHub/forgejo
0
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-25 07:02:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2021-08-19 21:41:20 +01:00 committed by GitHub
parent 4debb74eda
commit 03937891e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/proxy/proxy.go
View file

@ -56,7 +56,9 @@ func Match(u string) bool {
// Proxy returns the system proxy // Proxy returns the system proxy
func Proxy() func(req *http.Request) (*url.URL, error) { func Proxy() func(req *http.Request) (*url.URL, error) {
if !setting.Proxy.Enabled { if !setting.Proxy.Enabled {
return nil return func(req *http.Request) (*url.URL, error) {
return nil, nil
}
} }
if setting.Proxy.ProxyURL == "" { if setting.Proxy.ProxyURL == "" {
return http.ProxyFromEnvironment return http.ProxyFromEnvironment