Fossil

Differences From Artifact [e14691641d]:

• File src/url.c — part of check-in [78a5195392] at 2022-05-03 04:02:40 on branch fix_remote_url_overwrite_with_proxy — Simplification by omitting g.url.user and g.url.password backup copy since they are only swapped during short time and are restored right away. Also rename url.canonical backup copy to "proxyUrlCanonical" following name convention of already existing "proxyUrlPath" field. (user: mgagnon size: 25671)

To Artifact [adefd372e3]:

• File src/url.c — part of check-in [a242bb727e] at 2022-05-11 15:34:17 on branch fix_remote_url_overwrite_with_proxy — Only use the "http_proxy" environment variable if it is set to "system", if unset or set to "off", always use direct http connection. (user: mgagnon size: 25660) [more...]

533
534
535
536
537
538
539
540
541
542
543
544
545
546
547

** by the canonical name of the proxy (with userid and password suppressed).
*/
void url_enable_proxy(const char *zMsg){
  const char *zProxy;
  zProxy = zProxyOpt;
  if( zProxy==0 ){
    zProxy = db_get("proxy", 0);
    if( zProxy==0 || zProxy[0]==0 || is_false(zProxy) ){
      zProxy = fossil_getenv("http_proxy");
    }
  }
  if( zProxy && zProxy[0] && !is_false(zProxy)
      && !g.url.isSsh && !g.url.isFile ){
    char *zOriginalUrl = g.url.canonical;
    char *zOriginalHost = g.url.hostname;

|

533
534
535
536
537
538
539
540
541
542
543
544
545
546
547

** by the canonical name of the proxy (with userid and password suppressed).
*/
void url_enable_proxy(const char *zMsg){
  const char *zProxy;
  zProxy = zProxyOpt;
  if( zProxy==0 ){
    zProxy = db_get("proxy", 0);
    if( fossil_strcmp(zProxy, "system")==0 ){
      zProxy = fossil_getenv("http_proxy");
    }
  }
  if( zProxy && zProxy[0] && !is_false(zProxy)
      && !g.url.isSsh && !g.url.isFile ){
    char *zOriginalUrl = g.url.canonical;
    char *zOriginalHost = g.url.hostname;