- Alexander Beedie provided the patch for a noproxy problem: If I have set
CURLOPT_NOPROXY to "*", or to a host that should not use a proxy, I actually could still end up using a proxy if a proxy environment variable was set.
This commit is contained in:
11
lib/url.c
11
lib/url.c
@@ -4419,14 +4419,17 @@ static CURLcode create_conn(struct SessionHandle *data,
|
||||
}
|
||||
}
|
||||
|
||||
if(!proxy)
|
||||
proxy = detect_proxy(conn);
|
||||
else if(data->set.str[STRING_NOPROXY]) {
|
||||
if(check_noproxy(conn->host.name, data->set.str[STRING_NOPROXY])) {
|
||||
|
||||
if(data->set.str[STRING_NOPROXY] &&
|
||||
check_noproxy(conn->host.name, data->set.str[STRING_NOPROXY])) {
|
||||
if(proxy) {
|
||||
free(proxy); /* proxy is in exception list */
|
||||
proxy = NULL;
|
||||
}
|
||||
}
|
||||
else if(!proxy)
|
||||
proxy = detect_proxy(conn);
|
||||
|
||||
if(proxy && !*proxy) {
|
||||
free(proxy); /* Don't bother with an empty proxy string */
|
||||
proxy = NULL;
|
||||
|
Reference in New Issue
Block a user