diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2013-06-05 12:28:08 +0100 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2013-06-05 12:28:08 +0100 |
commit | 44e4ca5f05ceff06831dfac9066d35df37d7a830 (patch) | |
tree | 6b31b8b6dc1878ecc9392ded96786fbef3935e19 /content | |
parent | b04acde22874bb69c5ad8eba41e73fbb39589f0e (diff) | |
parent | 4d39d4314c48e54bf14ba1edb53c82e6c6d1712e (diff) | |
download | netsurf-44e4ca5f05ceff06831dfac9066d35df37d7a830.tar.gz netsurf-44e4ca5f05ceff06831dfac9066d35df37d7a830.tar.bz2 |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Diffstat (limited to 'content')
-rw-r--r-- | content/fetchers/curl.c | 8 |
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) == |