Fossil

Check-in [f201cb61]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:proxy setting test adj for new [32f8da0ce785b63] "fossil setting" logic per ticket [5e35dd60cf7410af64d41]
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | fsl_setting_proxy
Files: files | file ages | folders
SHA1:f201cb61a099055a45658b669867e4436962c133
User & Date: bch 2015-02-02 22:01:23
References
2015-02-03
18:19 Closed ticket [5e35dd60]: http_proxy env variable not honoured plus 4 other changes artifact: 3d34af6b user: nobody
17:52 Closed ticket [5e35dd60]. artifact: 1699820f user: nobody
Context
2015-02-03
17:48
merge [fsl_setting_proxy] to fix [5e35dd60cf7410af64d4] check-in: 00b62e05 user: bch tags: trunk
2015-02-02
22:01
proxy setting test adj for new [32f8da0ce785b63] "fossil setting" logic per ticket [5e35dd60cf7410af64d41] Closed-Leaf check-in: f201cb61 user: bch tags: fsl_setting_proxy
05:49
Fix a potential read past the end of an array in the full-text search. check-in: 41e5da02 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/url.c.

387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
** 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_truth(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;







|







387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
** 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;