You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2015/07/08 20:20:10 UTC
trafficserver git commit: Revert "TS-3687: ATS Session Cache should
remove expired sessions. This closes #222."
Repository: trafficserver
Updated Branches:
refs/heads/6.0.x 48609b5e7 -> aa366f531
Revert "TS-3687: ATS Session Cache should remove expired sessions. This closes #222."
This reverts commit c8c9c4fa0dad38552553b4235929a4f7ea8aa322.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/aa366f53
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/aa366f53
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/aa366f53
Branch: refs/heads/6.0.x
Commit: aa366f531a89d6cf30f1bed130550591d1ba60bf
Parents: 48609b5
Author: Bryan Call <bc...@apache.org>
Authored: Wed Jul 8 10:41:44 2015 -0700
Committer: Bryan Call <bc...@apache.org>
Committed: Wed Jul 8 10:41:44 2015 -0700
----------------------------------------------------------------------
iocore/net/SSLUtils.cc | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/aa366f53/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 6f64330..860cef0 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -186,14 +186,6 @@ SSL_CTX_add_extra_chain_cert_file(SSL_CTX *ctx, const char *chainfile)
return true;
}
-bool
-ssl_session_timed_out(SSL_SESSION *session)
-{
- return SSL_SESSION_get_timeout(session) < (long)(time(NULL) - SSL_SESSION_get_time(session));
-}
-
-static void ssl_rm_cached_session(SSL_CTX *ctx, SSL_SESSION *sess);
-
static SSL_SESSION *
ssl_get_cached_session(SSL *ssl, unsigned char *id, int len, int *copy)
{
@@ -209,15 +201,10 @@ ssl_get_cached_session(SSL *ssl, unsigned char *id, int len, int *copy)
SSL_SESSION *session = NULL;
if (session_cache->getSession(sid, &session)) {
- // Double check the timeout
- if (session && ssl_session_timed_out(session)) {
- // Due to bug in openssl, the timeout is checked, but only removed
- // from the openssl built-in hash table. The external remove cb is not called
- ssl_rm_cached_session(SSL_get_SSL_CTX(ssl), session);
- session = NULL;
- }
+ return session;
}
- return session;
+
+ return NULL;
}
static int