[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 250/256: proxy: read the "no_proxy" variable only i
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 250/256: proxy: read the "no_proxy" variable only if necessary |
Date: |
Fri, 06 Oct 2017 19:45:41 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit c4ebd8b46de09d45e251bed7e9bfc2a0ddf21d98
Author: Michael Kaufmann <address@hidden>
AuthorDate: Sun Sep 24 15:21:44 2017 +0200
proxy: read the "no_proxy" variable only if necessary
Reviewed-by: Daniel Stenberg
Closes #1919
---
lib/url.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/lib/url.c b/lib/url.c
index df12cbf6d..132dbb432 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -5352,22 +5352,21 @@ static CURLcode create_conn_helper_init_proxy(struct
connectdata *conn)
}
}
- no_proxy = curl_getenv("no_proxy");
- if(!no_proxy)
- no_proxy = curl_getenv("NO_PROXY");
+ if(!data->set.str[STRING_NOPROXY]) {
+ no_proxy = curl_getenv("no_proxy");
+ if(!no_proxy)
+ no_proxy = curl_getenv("NO_PROXY");
+ }
- if(check_noproxy(conn->host.name, data->set.str[STRING_NOPROXY]) ||
- (!data->set.str[STRING_NOPROXY] &&
- check_noproxy(conn->host.name, no_proxy))) {
+ if(check_noproxy(conn->host.name, data->set.str[STRING_NOPROXY] ?
+ data->set.str[STRING_NOPROXY] : no_proxy)) {
Curl_safefree(proxy);
Curl_safefree(socksproxy);
}
- else if(!proxy && !socksproxy)
#ifndef CURL_DISABLE_HTTP
+ else if(!proxy && !socksproxy)
/* if the host is not in the noproxy list, detect proxy. */
proxy = detect_proxy(conn);
-#else /* !CURL_DISABLE_HTTP */
- proxy = NULL;
#endif /* CURL_DISABLE_HTTP */
Curl_safefree(no_proxy);
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 194/256: tests: enable gssapi in travis-ci linux build, (continued)
- [GNUnet-SVN] [gnurl] 194/256: tests: enable gssapi in travis-ci linux build, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 168/256: vtls: fix memory corruption, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 170/256: OpenSSL: fix yet another mistake while encapsulating SSL backend data, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 206/256: cookies: reject oversized cookies, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 176/256: ossfuzz: add some more handled CURL options, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 155/256: fixup data/test1135, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 200/256: conversions: fix several compiler warnings, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 239/256: Set and use more necessary options when some protocols are disabled, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 173/256: configure: fix curl_off_t check's include order, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 181/256: Curl_checkheaders: make it available for IMAP and SMTP too, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 250/256: proxy: read the "no_proxy" variable only if necessary,
gnunet <=
- [GNUnet-SVN] [gnurl] 191/256: URL: on connection re-use, still pick the new remote port, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 192/256: test1150: verify same host fetch using different ports over proxy, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 199/256: server/getpart: provide dummy function to build conversion enabled, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 230/256: RELEASE-NOTES: synced with d8ab5dc50, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 134/256: headers: move the global_sslset() proto from multi.h to curl.h, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 190/256: RELEASE-NOTES: synced with 87501e57f, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 252/256: idn: fix source code comment, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 135/256: lib: bump version info (soname). Adapt and reenable test 1135., gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 193/256: tests: add initial gssapi test using stub implementation, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 226/256: tests: fix a compiler warning in test 643, gnunet, 2017/10/06