From: Paul Donohue <curl@paulsd.com>
Date: Tue, 15 Oct 2013 19:36:32 +0000 (+0200)
Subject: NSS: acknowledge the --no-sessionid/CURLOPT_SSL_SESSIONID_CACHE option
X-Git-Tag: curl-7_34_0~235
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f63603dec4519857498602f7a00acc0ffed29753;p=curl

NSS: acknowledge the --no-sessionid/CURLOPT_SSL_SESSIONID_CACHE option
---

diff --git a/lib/nss.c b/lib/nss.c
index 34dfbb1a7..43576e6d5 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -1244,8 +1244,9 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
   if(SSL_OptionSet(model, SSL_HANDSHAKE_AS_CLIENT, PR_TRUE) != SECSuccess)
     goto error;
 
-  /* do not use SSL cache if we are not going to verify peer */
-  ssl_no_cache = (data->set.ssl.verifypeer) ? PR_FALSE : PR_TRUE;
+  /* do not use SSL cache if disabled or we are not going to verify peer */
+  ssl_no_cache = (conn->ssl_config.sessionid && data->set.ssl.verifypeer) ?
+    PR_FALSE : PR_TRUE;
   if(SSL_OptionSet(model, SSL_NO_CACHE, ssl_no_cache) != SECSuccess)
     goto error;