mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-18 14:04:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Alexander Kourakos's lowercase environment variable fix

Browse Source
This commit is contained in:
Daniel Stenberg 2000-11-20 07:35:21 +00:00
parent bda9fde4d8
commit 91c879461e
1 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
lib/url.c
View File

@ -849,20 +849,29 @@ static CURLcode _connect(CURL *curl, CURLconnect **in_connect)
/* If proxy was not specified, we check for default proxy environment /* If proxy was not specified, we check for default proxy environment
variables, to enable i.e Lynx compliance: variables, to enable i.e Lynx compliance:
HTTP_PROXY http://some.server.dom:port/ http_proxy=http://some.server.dom:port/
HTTPS_PROXY http://some.server.dom:port/ https_proxy=http://some.server.dom:port/
FTP_PROXY http://some.server.dom:port/ ftp_proxy=http://some.server.dom:port/
GOPHER_PROXY http://some.server.dom:port/ gopher_proxy=http://some.server.dom:port/
NO_PROXY host.domain.dom (a comma-separated list of hosts which should no_proxy=domain1.dom,host.domain2.dom
not be proxied, or an asterisk to override all proxy variables) (a comma-separated list of hosts which should
ALL_PROXY seems to exist for the CERN www lib. Probably the first to not be proxied, or an asterisk to override
check for. all proxy variables)
all_proxy=http://some.server.dom:port/
(seems to exist for the CERN www lib. Probably
the first to check for.)
For compatibility, the all-uppercase versions of these variables are
checked if the lowercase versions don't exist.
*/ */
char *no_proxy=GetEnv("NO_PROXY"); char *no_proxy=NULL;
char *proxy=NULL; char *proxy=NULL;
char proxy_env[128]; char proxy_env[128];
no_proxy=GetEnv("no_proxy");
if(!no_proxy)
no_proxy=GetEnv("NO_PROXY");
if(!no_proxy || !strequal("*", no_proxy)) { if(!no_proxy || !strequal("*", no_proxy)) {
/* NO_PROXY wasn't specified or it wasn't just an asterisk */ /* NO_PROXY wasn't specified or it wasn't just an asterisk */
char *nope; char *nope;
@ -885,23 +894,31 @@ static CURLcode _connect(CURL *curl, CURLconnect **in_connect)
char *envp = proxy_env; char *envp = proxy_env;
char *prox; char *prox;
/* Now, build <PROTOCOL>_PROXY and check for such a one to use */ /* Now, build <protocol>_proxy and check for such a one to use */
while(*protop) { while(*protop)
*envp++ = toupper(*protop++); *envp++ = tolower(*protop++);
}
/* append _PROXY */ /* append _proxy */
strcpy(envp, "_PROXY"); strcpy(envp, "_proxy");
#if 0
infof(data, "DEBUG: checks the environment variable %s\n", proxy_env);
#endif
/* read the protocol proxy: */ /* read the protocol proxy: */
prox=GetEnv(proxy_env); prox=GetEnv(proxy_env);
if(!prox) {
/* There was no lowercase variable, try the uppercase version: */
for(envp = proxy_env; *envp; envp++)
*envp = toupper(*envp);
prox=GetEnv(proxy_env);
}
if(prox && *prox) { /* don't count "" strings */ if(prox && *prox) { /* don't count "" strings */
proxy = prox; /* use this */ proxy = prox; /* use this */
} }
else else {
proxy = GetEnv("ALL_PROXY"); /* default proxy to use */ proxy = GetEnv("all_proxy"); /* default proxy to use */
if(!proxy)
proxy=GetEnv("ALL_PROXY");
}
if(proxy && *proxy) { if(proxy && *proxy) {
/* we have a proxy here to set */ /* we have a proxy here to set */
@ -909,7 +926,7 @@ static CURLcode _connect(CURL *curl, CURLconnect **in_connect)
data->bits.proxystringalloc=1; /* this needs to be freed later */ data->bits.proxystringalloc=1; /* this needs to be freed later */
data->bits.httpproxy=1; data->bits.httpproxy=1;
} }
} /* if (!nope) - it wasn't specfied non-proxy */ } /* if (!nope) - it wasn't specified non-proxy */
} /* NO_PROXY wasn't specified or '*' */ } /* NO_PROXY wasn't specified or '*' */
if(no_proxy) if(no_proxy)
free(no_proxy); free(no_proxy);