From 9924bcf850836c5f33bcc3199cd34263b2a3acf2 Mon Sep 17 00:00:00 2001 From: John-Mark Bell Date: Sun, 4 Nov 2012 12:01:45 +0000 Subject: Revert "Enable verbose curl debug" This reverts commit f5a98defaec97cf7a18516c8c9af49f10b93f0cf. --- content/fetchers/curl.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c index e40d18a3e..f33dfde50 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); -- cgit v1.2.3 From debe0e345bf453a58bf319a84d5845cce6b38d8e Mon Sep 17 00:00:00 2001 From: John-Mark Bell Date: Sun, 4 Nov 2012 14:07:22 +0000 Subject: Disable SSL session ID caching. --- content/fetchers/curl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c index f33dfde50..bc9215977 100644 --- a/content/fetchers/curl.c +++ b/content/fetchers/curl.c @@ -633,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); -- cgit v1.2.3