summaryrefslogtreecommitdiff
path: root/content/fetchers
diff options
context:
space:
mode:
Diffstat (limited to 'content/fetchers')
-rw-r--r--content/fetchers/curl.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index ed4c75952..28c0f6095 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -613,11 +613,19 @@ 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));
+
+#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,
nsoption_int(http_proxy_auth) ==