Repository: trafficserver Updated Branches: refs/heads/master c8bd8b125 -> 982cca2ff
[TS-3092] Set SSL CTX timeout regardless of SSL session cache Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/cc889ade Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/cc889ade Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/cc889ade Branch: refs/heads/master Commit: cc889ade32ffbd1c5a5249edf21b96f6701192cc Parents: c8bd8b1 Author: Brian Geffon <bri...@apache.org> Authored: Sun Sep 21 22:50:27 2014 -0700 Committer: Brian Geffon <bri...@apache.org> Committed: Sun Sep 21 22:50:27 2014 -0700 ---------------------------------------------------------------------- iocore/net/SSLUtils.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/cc889ade/iocore/net/SSLUtils.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc index 8a144cd..a57ce90 100644 --- a/iocore/net/SSLUtils.cc +++ b/iocore/net/SSLUtils.cc @@ -1001,6 +1001,10 @@ SSLInitServerContext( // disable selected protocols SSL_CTX_set_options(ctx, params->ssl_ctx_options); + if (params->ssl_session_cache_timeout) { + SSL_CTX_set_timeout(ctx, params->ssl_session_cache_timeout); + } + switch (params->ssl_session_cache) { case SSLConfigParams::SSL_SESSION_CACHE_MODE_OFF: SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF|SSL_SESS_CACHE_NO_INTERNAL); @@ -1008,9 +1012,6 @@ SSLInitServerContext( case SSLConfigParams::SSL_SESSION_CACHE_MODE_SERVER: SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_SERVER); SSL_CTX_sess_set_cache_size(ctx, params->ssl_session_cache_size); - if (params->ssl_session_cache_timeout) { - SSL_CTX_set_timeout(ctx, params->ssl_session_cache_timeout); - } break; }
