diff options
| author | Rob Kendrick (fatigue) <rjek@netsurf-browser.org> | 2012-11-04 15:02:29 +0000 |
|---|---|---|
| committer | Rob Kendrick (fatigue) <rjek@netsurf-browser.org> | 2012-11-04 15:02:29 +0000 |
| commit | 09bf071ebcdb72280cc96ae5f3501b0c115e7f3a (patch) | |
| tree | bcd5b7b94f30b8e1ee5fa3bc6e6bf48768e038ce | |
| parent | 8e2d99ef5a862ec35db9554ffcb1940d97692b54 (diff) | |
| parent | debe0e345bf453a58bf319a84d5845cce6b38d8e (diff) | |
| download | netsurf-09bf071ebcdb72280cc96ae5f3501b0c115e7f3a.tar.gz netsurf-09bf071ebcdb72280cc96ae5f3501b0c115e7f3a.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
| -rw-r--r-- | content/fetchers/curl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c index e40d18a3e..bc9215977 100644 --- a/content/fetchers/curl.c +++ b/content/fetchers/curl.c @@ -194,11 +194,8 @@ void fetch_curl_register(void) SETOPT(CURLOPT_VERBOSE, 0); } SETOPT(CURLOPT_ERRORBUFFER, fetch_error_buffer); - if (nsoption_bool(suppress_curl_debug)) { + if (nsoption_bool(suppress_curl_debug)) SETOPT(CURLOPT_DEBUGFUNCTION, fetch_curl_ignore_debug); - } else { - SETOPT(CURLOPT_VERBOSE, 1); - } SETOPT(CURLOPT_WRITEFUNCTION, fetch_curl_data); SETOPT(CURLOPT_HEADERFUNCTION, fetch_curl_header); SETOPT(CURLOPT_PROGRESSFUNCTION, fetch_curl_progress); @@ -636,6 +633,9 @@ fetch_curl_set_options(struct curl_fetch_info *f) SETOPT(CURLOPT_PROXY, NULL); } + /* Disable SSL session ID caching, as some servers can't cope. */ + SETOPT(CURLOPT_SSL_SESSIONID_CACHE, 0); + if (urldb_get_cert_permissions(f->url)) { /* Disable certificate verification */ SETOPT(CURLOPT_SSL_VERIFYPEER, 0L); |