Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TLMSP curl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CYBER - Cyber Security
TS 103 523 MSP
TLMSP
TLMSP curl
Commits
483a586d
Commit
483a586d
authored
18 years ago
by
Yang Tse
Browse files
Options
Downloads
Patches
Plain Diff
Avoid variable declaration shadowing previously declared one
parent
4ac54f8c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/ssluse.c
+4
-4
4 additions, 4 deletions
lib/ssluse.c
with
4 additions
and
4 deletions
lib/ssluse.c
+
4
−
4
View file @
483a586d
...
...
@@ -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"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment