Fossil SCM
ssh:// and file:// protocols now ignore proxy. (From Martin Gagnon.)
Commit
0d55a0ad0fc44da035042d8696dd9b18ab419b37
Parent
e5905473a8dbd64…
1 file changed
+2
-1
+2
-1
| --- src/url.c | ||
| +++ src/url.c | ||
| @@ -325,11 +325,12 @@ | ||
| 325 | 325 | zProxy = db_get("proxy", 0); |
| 326 | 326 | if( zProxy==0 || zProxy[0]==0 || is_truth(zProxy) ){ |
| 327 | 327 | zProxy = fossil_getenv("http_proxy"); |
| 328 | 328 | } |
| 329 | 329 | } |
| 330 | - if( zProxy && zProxy[0] && !is_false(zProxy) ){ | |
| 330 | + if( zProxy && zProxy[0] && !is_false(zProxy) | |
| 331 | + && !g.urlIsSsh && !g.urlIsFile ){ | |
| 331 | 332 | char *zOriginalUrl = g.urlCanonical; |
| 332 | 333 | char *zOriginalHost = g.urlHostname; |
| 333 | 334 | char *zOriginalUser = g.urlUser; |
| 334 | 335 | char *zOriginalPasswd = g.urlPasswd; |
| 335 | 336 | unsigned uOriginalFlags = g.urlFlags; |
| 336 | 337 |
| --- src/url.c | |
| +++ src/url.c | |
| @@ -325,11 +325,12 @@ | |
| 325 | zProxy = db_get("proxy", 0); |
| 326 | if( zProxy==0 || zProxy[0]==0 || is_truth(zProxy) ){ |
| 327 | zProxy = fossil_getenv("http_proxy"); |
| 328 | } |
| 329 | } |
| 330 | if( zProxy && zProxy[0] && !is_false(zProxy) ){ |
| 331 | char *zOriginalUrl = g.urlCanonical; |
| 332 | char *zOriginalHost = g.urlHostname; |
| 333 | char *zOriginalUser = g.urlUser; |
| 334 | char *zOriginalPasswd = g.urlPasswd; |
| 335 | unsigned uOriginalFlags = g.urlFlags; |
| 336 |
| --- src/url.c | |
| +++ src/url.c | |
| @@ -325,11 +325,12 @@ | |
| 325 | zProxy = db_get("proxy", 0); |
| 326 | if( zProxy==0 || zProxy[0]==0 || is_truth(zProxy) ){ |
| 327 | zProxy = fossil_getenv("http_proxy"); |
| 328 | } |
| 329 | } |
| 330 | if( zProxy && zProxy[0] && !is_false(zProxy) |
| 331 | && !g.urlIsSsh && !g.urlIsFile ){ |
| 332 | char *zOriginalUrl = g.urlCanonical; |
| 333 | char *zOriginalHost = g.urlHostname; |
| 334 | char *zOriginalUser = g.urlUser; |
| 335 | char *zOriginalPasswd = g.urlPasswd; |
| 336 | unsigned uOriginalFlags = g.urlFlags; |
| 337 |