Skip to content
Snippets Groups Projects
Commit 483a586d authored by Yang Tse's avatar Yang Tse
Browse files

Avoid variable declaration shadowing previously declared one

parent 4ac54f8c
No related branches found
No related tags found
No related merge requests found
......@@ -1488,16 +1488,16 @@ Curl_ossl_connect_step3(struct connectdata *conn,
if(Curl_ssl_getsessionid(conn, &ssl_sessionid, NULL)) {
/* Since this is not a cached session ID, then we want to stach this one
in the cache! */
SSL_SESSION *ssl_sessionid;
SSL_SESSION *our_ssl_sessionid;
#ifdef HAVE_SSL_GET1_SESSION
ssl_sessionid = SSL_get1_session(connssl->handle);
our_ssl_sessionid = SSL_get1_session(connssl->handle);
/* SSL_get1_session() will increment the reference
count and the session will stay in memory until explicitly freed with
SSL_SESSION_free(3), regardless of its state.
This function was introduced in openssl 0.9.5a. */
#else
ssl_sessionid = SSL_get_session(connssl->handle);
our_ssl_sessionid = SSL_get_session(connssl->handle);
/* if SSL_get1_session() is unavailable, use SSL_get_session().
This is an inferior option because the session can be flushed
......@@ -1508,7 +1508,7 @@ Curl_ossl_connect_step3(struct connectdata *conn,
untested.
*/
#endif
retcode = Curl_ssl_addsessionid(conn, ssl_sessionid,
retcode = Curl_ssl_addsessionid(conn, our_ssl_sessionid,
0 /* unknown size */);
if(retcode) {
failf(data, "failed to store ssl session");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment