Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Only use the "http_proxy" environment variable if it is set to "system", if unset or set to "off", always use direct http connection. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | fix_remote_url_overwrite_with_proxy |
| Files: | files | file ages | folders |
| SHA3-256: |
a242bb727ec0a7c28eb590fa1b10d19a |
| User & Date: | mgagnon 2022-05-11 15:34:17.972 |
Context
|
2022-05-11
| ||
| 15:42 | Fix remote-url overwriting by proxy url bug and use the http_proxy environment variable only when explicitly requested by setting the proxy setting to "system". check-in: a791d5e805 user: mgagnon tags: trunk | |
| 15:34 | Only use the "http_proxy" environment variable if it is set to "system", if unset or set to "off", always use direct http connection. Closed-Leaf check-in: a242bb727e user: mgagnon tags: fix_remote_url_overwrite_with_proxy | |
| 15:06 | Merge in latest changes from trunk check-in: 5605aef9b9 user: mgagnon tags: fix_remote_url_overwrite_with_proxy | |
Changes
Changes to src/db.c.
| ︙ | ︙ | |||
4366 4367 4368 4369 4370 4371 4372 | ** to obtain a check-in lock during auto-sync, the server will ** send the "pragma avoid-delta-manifests" statement in its reply, ** which will cause the client to avoid generating a delta ** manifest. */ /* ** SETTING: proxy width=32 default=off | < | < | | 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 | ** to obtain a check-in lock during auto-sync, the server will ** send the "pragma avoid-delta-manifests" statement in its reply, ** which will cause the client to avoid generating a delta ** manifest. */ /* ** SETTING: proxy width=32 default=off ** URL of the HTTP proxy. If "system", the "http_proxy" environment variable is ** consulted. If undefined or "off", a direct HTTP connection is used. */ /* ** SETTING: redirect-to-https default=0 width=-1 ** Specifies whether or not to redirect http:// requests to ** https:// URIs. A value of 0 (the default) means not to ** redirect, 1 means to redirect only the /login page, and 2 ** means to always redirect. |
| ︙ | ︙ |
Changes to src/url.c.
| ︙ | ︙ | |||
533 534 535 536 537 538 539 |
** 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);
| | | 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;
|
| ︙ | ︙ |