Fossil

Check-in [d8bf3113]
Login

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

Overview
Comment:Fix an issue that sets proxy = getenv(http_proxy) even when global proxy option is disabled
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:d8bf3113362d4b8baada2b029966dada998a1314
User & Date: altufaltu 2008-10-25 14:29:44
Original User & Date: a0756885 2008-10-25 14:29:44
Context
2008-10-25
17:19
Update conditions when to look for proxy URL in environment. check-in: d65d619d user: altufaltu tags: trunk
14:29
Fix an issue that sets proxy = getenv(http_proxy) even when global proxy option is disabled check-in: d8bf3113 user: altufaltu tags: trunk
2008-10-24
18:23
Begin adding a TH1 script trace mechanism actived by the --th_trace option on the "server" and "ui" commands. The implementation is incomplete, but the plane is landing.... check-in: f55c6a1b user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

debian/makedeb.sh became a regular file.

Changes to src/url.c.

158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
** to the proxy server.
*/
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] || is_false(zProxy) ){
      zProxy = getenv("http_proxy");
    }
  }
  if( zProxy && zProxy[0] && !is_false(zProxy) ){
    char *zOriginalUrl = g.urlCanonical;
    char *zOriginalHost = g.urlHostname;
    if( zMsg ) printf("%s%s\n", zMsg, zProxy);
    url_parse(zProxy);
    g.urlPath = zOriginalUrl;
    g.urlHostname = zOriginalHost;
  }
}







|












158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
** to the proxy server.
*/
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] || !is_false(zProxy) ){
      zProxy = getenv("http_proxy");
    }
  }
  if( zProxy && zProxy[0] && !is_false(zProxy) ){
    char *zOriginalUrl = g.urlCanonical;
    char *zOriginalHost = g.urlHostname;
    if( zMsg ) printf("%s%s\n", zMsg, zProxy);
    url_parse(zProxy);
    g.urlPath = zOriginalUrl;
    g.urlHostname = zOriginalHost;
  }
}