aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_manager.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-09-26 12:19:12 +0200
committerIngela Anderton Andin <[email protected]>2012-09-26 12:19:12 +0200
commit71963a800f01680cd3b8933bb97a718c835b2f1f (patch)
tree6eaa5e0525bf7421459cc2fd3f3fd5374cd8cc17 /lib/ssl/src/ssl_manager.erl
parentf4654ea1d941f0067be6a6b1b18ad365eff91017 (diff)
parentd3d0048deb56b548b6636e7f04e0e0bf126aacd9 (diff)
downloadotp-71963a800f01680cd3b8933bb97a718c835b2f1f.tar.gz
otp-71963a800f01680cd3b8933bb97a718c835b2f1f.tar.bz2
otp-71963a800f01680cd3b8933bb97a718c835b2f1f.zip
Merge branch 'ia/ssl/reuse_session_expired-test'
* ia/ssl/reuse_session_expired-test: ssl: Adopt test case to not take so long
Diffstat (limited to 'lib/ssl/src/ssl_manager.erl')
-rw-r--r--lib/ssl/src/ssl_manager.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl
index af2bfa394d..0cf4f2ce33 100644
--- a/lib/ssl/src/ssl_manager.erl
+++ b/lib/ssl/src/ssl_manager.erl
@@ -191,7 +191,7 @@ init([Name, Opts]) ->
proplists:get_value(session_lifetime, Opts, ?'24H_in_sec'),
CertDb = ssl_certificate_db:create(),
SessionCache = CacheCb:init(proplists:get_value(session_cb_init_args, Opts, [])),
- Timer = erlang:send_after(SessionLifeTime * 1000,
+ Timer = erlang:send_after(SessionLifeTime * 1000 + 5000,
self(), validate_sessions),
erlang:send_after(?CLEAR_PEM_CACHE, self(), clear_pem_cache),
{ok, #state{certificate_db = CertDb,