From 4e248695248d2c749b2d9e892549ba0e9390a3d0 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 4 Jun 2013 18:11:15 +0100 Subject: Add and use no proxy list option --- content/fetchers/curl.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'content/fetchers') diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c index ed4c75952..ca89c95de 100644 --- a/content/fetchers/curl.c +++ b/content/fetchers/curl.c @@ -613,11 +613,16 @@ fetch_curl_set_options(struct curl_fetch_info *f) SETOPT(CURLOPT_USERPWD, NULL); } + /* set up proxy options */ if (nsoption_bool(http_proxy) && (nsoption_charp(http_proxy_host) != NULL) && (strncmp(nsurl_access(f->url), "file:", 5) != 0)) { SETOPT(CURLOPT_PROXY, nsoption_charp(http_proxy_host)); SETOPT(CURLOPT_PROXYPORT, (long) nsoption_int(http_proxy_port)); + + /* setup the omission list */ + SETOPT(CURLOPT_NOPROXY, nsoption_charp(http_proxy_noproxy)); + if (nsoption_int(http_proxy_auth) != OPTION_HTTP_PROXY_AUTH_NONE) { SETOPT(CURLOPT_PROXYAUTH, nsoption_int(http_proxy_auth) == -- cgit v1.2.3 From 4d39d4314c48e54bf14ba1edb53c82e6c6d1712e Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 4 Jun 2013 18:30:22 +0100 Subject: only set no proxy value in modern enough versions of teh library --- content/fetchers/curl.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'content/fetchers') diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c index ca89c95de..28c0f6095 100644 --- a/content/fetchers/curl.c +++ b/content/fetchers/curl.c @@ -620,8 +620,11 @@ fetch_curl_set_options(struct curl_fetch_info *f) SETOPT(CURLOPT_PROXY, nsoption_charp(http_proxy_host)); SETOPT(CURLOPT_PROXYPORT, (long) nsoption_int(http_proxy_port)); +#if LIBCURL_VERSION_NUM >= 0x071304 + /* Added in 7.19.4 */ /* setup the omission list */ SETOPT(CURLOPT_NOPROXY, nsoption_charp(http_proxy_noproxy)); +#endif if (nsoption_int(http_proxy_auth) != OPTION_HTTP_PROXY_AUTH_NONE) { SETOPT(CURLOPT_PROXYAUTH, -- cgit v1.2.3