curl*: remove unneeded option declarations

They are equivalent to CURLOPT_USERPWD used a couple of line above and
aren't supported by curl versions older than 7.19.1

diff --git a/src/curl.c b/src/curl.c
index 3e7c5a5dde7a0efeaad94b8933a79e109dcfb2c3..0e6596d490a2d8699dad8f054615ffefc29c7d4a 100644 (file)
--- a/src/curl.c
+++ b/src/curl.c
@@ -389,13 +389,9 @@ static int cc_page_init_curl (web_page_t *wp) /* {{{ */
     ssnprintf (wp->credentials, credentials_size, "%s:%s",
         wp->user, (wp->pass == NULL) ? "" : wp->pass);
     curl_easy_setopt (wp->curl, CURLOPT_USERPWD, wp->credentials);
-    
+
     if (wp->digest)
-    {
       curl_easy_setopt (wp->curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
-      curl_easy_setopt (wp->curl, CURLOPT_USERNAME, wp->user);
-      curl_easy_setopt (wp->curl, CURLOPT_PASSWORD, wp->pass);
-    }
   }
 
   curl_easy_setopt (wp->curl, CURLOPT_SSL_VERIFYPEER, (long) wp->verify_peer);

diff --git a/src/curl_json.c b/src/curl_json.c
index 6a01590217883d985ee7098934d6387ed1cdee54..58f0b35c10d84c63aa1b2b52f6a2f6c237196ab1 100644 (file)
--- a/src/curl_json.c
+++ b/src/curl_json.c
@@ -611,13 +611,9 @@ static int cj_init_curl (cj_t *db) /* {{{ */
     ssnprintf (db->credentials, credentials_size, "%s:%s",
                db->user, (db->pass == NULL) ? "" : db->pass);
     curl_easy_setopt (db->curl, CURLOPT_USERPWD, db->credentials);
-    
+
     if (db->digest)
-    {
       curl_easy_setopt (db->curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
-      curl_easy_setopt (db->curl, CURLOPT_USERNAME, db->user);
-      curl_easy_setopt (db->curl, CURLOPT_PASSWORD, db->pass);
-    }
   }
 
   curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYPEER, (long) db->verify_peer);

diff --git a/src/curl_xml.c b/src/curl_xml.c
index 6d36d29dd2172178757d81ec37efcfa23c882577..850a4aa582c756dd0c2310bb8bb3bd32c62488e7 100644 (file)
--- a/src/curl_xml.c
+++ b/src/curl_xml.c
@@ -861,13 +861,9 @@ static int cx_init_curl (cx_t *db) /* {{{ */
     ssnprintf (db->credentials, credentials_size, "%s:%s",
                db->user, (db->pass == NULL) ? "" : db->pass);
     curl_easy_setopt (db->curl, CURLOPT_USERPWD, db->credentials);
-    
+
     if (db->digest)
-    {
       curl_easy_setopt (db->curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
-      curl_easy_setopt (db->curl, CURLOPT_USERNAME, db->user);
-      curl_easy_setopt (db->curl, CURLOPT_PASSWORD, db->pass);
-    }
   }
 
   curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYPEER, db->verify_peer ? 1L : 0L);