summaryrefslogtreecommitdiff
path: root/content/fetch.c
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2004-07-27 15:49:28 +0000
committerJames Bursa <james@netsurf-browser.org>2004-07-27 15:49:28 +0000
commit534b464becb6c429b5976695bfe142690f45b779 (patch)
tree00f97e2b09aa68ab1653566678fc6f64b86e463b /content/fetch.c
parentd378575d4c484d4e9fe8dba56c93323053de668a (diff)
downloadnetsurf-534b464becb6c429b5976695bfe142690f45b779.tar.gz
netsurf-534b464becb6c429b5976695bfe142690f45b779.tar.bz2
[project @ 2004-07-27 15:49:28 by bursa]
Implement proxy authentication. Bring templates in line with style guide (icon sizes and fill display fields), and remove dead icons. Clean up choices dialog code. Fix persistent dialog code. Make browser choices the default pane. svn path=/import/netsurf/; revision=1153
Diffstat (limited to 'content/fetch.c')
-rw-r--r--content/fetch.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/content/fetch.c b/content/fetch.c
index aca890cc4..81f5e3a26 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -351,6 +351,7 @@ CURLcode fetch_set_options(struct fetch *f)
{
CURLcode code;
struct login *li;
+ char proxy_userpwd[100];
#undef SETOPT
#define SETOPT(option, value) \
@@ -388,6 +389,17 @@ CURLcode fetch_set_options(struct fetch *f)
if (option_http_proxy && option_http_proxy_host) {
SETOPT(CURLOPT_PROXY, option_http_proxy_host);
SETOPT(CURLOPT_PROXYPORT, (long) option_http_proxy_port);
+ if (option_http_proxy_auth != OPTION_HTTP_PROXY_AUTH_NONE) {
+ SETOPT(CURLOPT_PROXYAUTH,
+ option_http_proxy_auth ==
+ OPTION_HTTP_PROXY_AUTH_BASIC ?
+ (long) CURLAUTH_BASIC :
+ (long) CURLAUTH_NTLM);
+ snprintf(proxy_userpwd, sizeof proxy_userpwd, "%s:%s",
+ option_http_proxy_auth_user,
+ option_http_proxy_auth_pass);
+ SETOPT(CURLOPT_PROXYUSERPWD, proxy_userpwd);
+ }
}
return CURLE_OK;