From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 6 Jul 2010 20:43:05 +0000 (+0200)
Subject: curl: avoid setting libcurl options to its default
X-Git-Tag: curl-7_21_1~102
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0417d34533c187db1ac0fadd6765573defb69d00;p=curl

curl: avoid setting libcurl options to its default

it makes the --libcurl output easier to follow.
---

diff --git a/src/main.c b/src/main.c
index fc255c71d..72ab28868 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5088,7 +5088,7 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
                       config->hostpubmd5);
 
         /* default to strict verifyhost */
-        my_setopt(curl, CURLOPT_SSL_VERIFYHOST, 2);
+        /* my_setopt(curl, CURLOPT_SSL_VERIFYHOST, 2); */
         if(config->cacert || config->capath) {
           if (config->cacert)
             my_setopt_str(curl, CURLOPT_CAINFO, config->cacert);
@@ -5302,8 +5302,9 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
                   config->ftp_alternative_to_user);
 
         /* curl 7.16.0 */
-        my_setopt(curl, CURLOPT_SSL_SESSIONID_CACHE,
-                  !config->disable_sessionid);
+        if(config->disable_sessionid)
+          my_setopt(curl, CURLOPT_SSL_SESSIONID_CACHE,
+                    !config->disable_sessionid);
 
         /* curl 7.16.2 */
         if(config->raw) {