diff options
| author | Richard Levitte <levitte@openssl.org> | 2002-02-14 17:15:45 +0300 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2002-02-14 17:15:45 +0300 |
| commit | 30b5ce14d8c5b620893462b09f84c1b54b943234 (patch) | |
| tree | 2a8883af808aa9075168f8ae2e6d25e6ec14c9b1 /ssl | |
| parent | ed2f196afea5ff12a4a0e74ed0fbd843f92d9937 (diff) | |
Merge in recent changes from 0.9.6-stable.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_lib.c | 8 | ||||
| -rw-r--r-- | ssl/ssl_sess.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 2006a5a1eb..24cec2afe5 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1472,9 +1472,10 @@ void ssl_update_cache(SSL *s,int mode) * and it would be rather hard to do anyway :-) */ if (s->session->session_id_length == 0) return; - if ((s->ctx->session_cache_mode & mode) - && (!s->hit) - && SSL_CTX_add_session(s->ctx,s->session) + i=s->ctx->session_cache_mode; + if ((i & mode) && (!s->hit) + && ((i & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP) + || SSL_CTX_add_session(s->ctx,s->session)) && (s->ctx->new_session_cb != NULL)) { CRYPTO_add(&s->session->references,1,CRYPTO_LOCK_SSL_SESSION); @@ -1483,7 +1484,6 @@ void ssl_update_cache(SSL *s,int mode) } /* auto flush every 255 connections */ - i=s->ctx->session_cache_mode; if ((!(i & SSL_SESS_CACHE_NO_AUTO_CLEAR)) && ((i & mode) == mode)) { diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 7064262def..8476f41707 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -423,10 +423,10 @@ static int remove_session_lock(SSL_CTX *ctx, SSL_SESSION *c, int lck) if ((c != NULL) && (c->session_id_length != 0)) { if(lck) CRYPTO_w_lock(CRYPTO_LOCK_SSL_CTX); - r=(SSL_SESSION *)lh_delete(ctx->sessions,c); - if (r != NULL) + if ((r = (SSL_SESSION *)lh_retrieve(ctx->sessions,c)) == c) { ret=1; + r=(SSL_SESSION *)lh_delete(ctx->sessions,c); SSL_SESSION_list_remove(ctx,c); } |