diff options
| author | James Bursa <james@netsurf-browser.org> | 2004-02-13 16:09:12 +0000 |
|---|---|---|
| committer | James Bursa <james@netsurf-browser.org> | 2004-02-13 16:09:12 +0000 |
| commit | 1319ff78c89fd0c34feea187ca3d67058875fbe6 (patch) | |
| tree | b3a1bb74c14305e38991db53e9119c72084daa87 /content | |
| parent | add94ad0381bae4889dcd46620b8bfe4e4f443ce (diff) | |
| download | netsurf-1319ff78c89fd0c34feea187ca3d67058875fbe6.tar.gz netsurf-1319ff78c89fd0c34feea187ca3d67058875fbe6.tar.bz2 | |
[project @ 2004-02-13 16:09:12 by bursa]
Clean up and rewrite options code.
svn path=/import/netsurf/; revision=536
Diffstat (limited to 'content')
| -rw-r--r-- | content/fetch.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/content/fetch.c b/content/fetch.c index ac47b4a46..295324484 100644 --- a/content/fetch.c +++ b/content/fetch.c @@ -2,7 +2,7 @@ * This file is part of NetSurf, http://netsurf.sourceforge.net/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license - * Copyright 2003 James Bursa <bursa@users.sourceforge.net> + * Copyright 2004 James Bursa <bursa@users.sourceforge.net> * Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net> */ @@ -291,11 +291,12 @@ struct fetch * fetch_start(char *url, char *referer, assert(code == CURLE_OK); /* use proxy if options dictate this */ - if (OPTIONS.http) - { - code = curl_easy_setopt(fetch->curl_handle, CURLOPT_PROXY, OPTIONS.http_proxy); + if (option_http_proxy && option_http_proxy_host) { + code = curl_easy_setopt(fetch->curl_handle, CURLOPT_PROXY, + option_http_proxy_host); assert(code == CURLE_OK); - code = curl_easy_setopt(fetch->curl_handle, CURLOPT_PROXYPORT, (long)OPTIONS.http_port); + code = curl_easy_setopt(fetch->curl_handle, CURLOPT_PROXYPORT, + (long) option_http_proxy_port); assert(code == CURLE_OK); } |