diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-06-28 17:08:56 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-06-28 17:08:56 +0200 |
| commit | ee679e41535dd83aba7c8fb55fa12bdc6e89313c (patch) | |
| tree | 609b2b36ae8ad76b77e80c999205bc736306555b /lib/ssl/src | |
| parent | 17f389d3d79e7c020431f3b6941cc301a977c5d8 (diff) | |
| parent | 2262ba2690ba5a977576d04461bdc36f6f73d825 (diff) | |
| download | otp-ee679e41535dd83aba7c8fb55fa12bdc6e89313c.tar.gz otp-ee679e41535dd83aba7c8fb55fa12bdc6e89313c.tar.bz2 otp-ee679e41535dd83aba7c8fb55fa12bdc6e89313c.zip | |
Merge branch 'ia/ssl/use-erlang-send-after-instead-of-timer-send-after' into dev
* ia/ssl/use-erlang-send-after-instead-of-timer-send-after:
Use erlang:send_after instead of timer:send_after
Conflicts:
lib/ssl/test/ssl_session_cache_SUITE.erl
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_manager.erl | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl index 541ca1e918..371bfafae0 100644 --- a/lib/ssl/src/ssl_manager.erl +++ b/lib/ssl/src/ssl_manager.erl @@ -50,7 +50,8 @@ session_cache_cb, session_lifetime, certificate_db, - session_validation_timer + session_validation_timer, + last_delay_timer %% Keep for testing purposes }). -define('24H_in_msec', 8640000). @@ -273,15 +274,17 @@ handle_cast({invalidate_session, Host, Port, #state{session_cache = Cache, session_cache_cb = CacheCb} = State) -> CacheCb:update(Cache, {{Host, Port}, ID}, Session#session{is_resumable = false}), - timer:send_after(delay_time(), self(), {delayed_clean_session, {{Host, Port}, ID}}), - {noreply, State}; + TRef = + erlang:send_after(delay_time(), self(), {delayed_clean_session, {{Host, Port}, ID}}), + {noreply, State#state{last_delay_timer = TRef}}; handle_cast({invalidate_session, Port, #session{session_id = ID} = Session}, #state{session_cache = Cache, session_cache_cb = CacheCb} = State) -> CacheCb:update(Cache, {Port, ID}, Session#session{is_resumable = false}), - timer:send_after(delay_time(), self(), {delayed_clean_session, {Port, ID}}), - {noreply, State}; + TRef = + erlang:send_after(delay_time(), self(), {delayed_clean_session, {Port, ID}}), + {noreply, State#state{last_delay_timer = TRef}}; handle_cast({recache_pem, File, LastWrite, Pid, From}, #state{certificate_db = [_, FileToRefDb, _]} = State0) -> |