Fossil SCM
Fix an issue that sets proxy = getenv(http_proxy) even when global proxy option is disabled
Commit
d8bf3113362d4b8baada2b029966dada998a1314
Parent
f55c6a1b62ccda5…
2 files changed
+1
-1
No diff available
+1
-1
| --- src/url.c | ||
| +++ src/url.c | ||
| @@ -160,11 +160,11 @@ | ||
| 160 | 160 | void url_enable_proxy(const char *zMsg){ |
| 161 | 161 | const char *zProxy; |
| 162 | 162 | zProxy = zProxyOpt; |
| 163 | 163 | if( zProxy==0 ){ |
| 164 | 164 | zProxy = db_get("proxy", 0); |
| 165 | - if( zProxy==0 || zProxy[0] || is_false(zProxy) ){ | |
| 165 | + if( zProxy==0 || zProxy[0] || !is_false(zProxy) ){ | |
| 166 | 166 | zProxy = getenv("http_proxy"); |
| 167 | 167 | } |
| 168 | 168 | } |
| 169 | 169 | if( zProxy && zProxy[0] && !is_false(zProxy) ){ |
| 170 | 170 | char *zOriginalUrl = g.urlCanonical; |
| 171 | 171 |
| --- src/url.c | |
| +++ src/url.c | |
| @@ -160,11 +160,11 @@ | |
| 160 | void url_enable_proxy(const char *zMsg){ |
| 161 | const char *zProxy; |
| 162 | zProxy = zProxyOpt; |
| 163 | if( zProxy==0 ){ |
| 164 | zProxy = db_get("proxy", 0); |
| 165 | if( zProxy==0 || zProxy[0] || is_false(zProxy) ){ |
| 166 | zProxy = getenv("http_proxy"); |
| 167 | } |
| 168 | } |
| 169 | if( zProxy && zProxy[0] && !is_false(zProxy) ){ |
| 170 | char *zOriginalUrl = g.urlCanonical; |
| 171 |
| --- src/url.c | |
| +++ src/url.c | |
| @@ -160,11 +160,11 @@ | |
| 160 | void url_enable_proxy(const char *zMsg){ |
| 161 | const char *zProxy; |
| 162 | zProxy = zProxyOpt; |
| 163 | if( zProxy==0 ){ |
| 164 | zProxy = db_get("proxy", 0); |
| 165 | if( zProxy==0 || zProxy[0] || !is_false(zProxy) ){ |
| 166 | zProxy = getenv("http_proxy"); |
| 167 | } |
| 168 | } |
| 169 | if( zProxy && zProxy[0] && !is_false(zProxy) ){ |
| 170 | char *zOriginalUrl = g.urlCanonical; |
| 171 |