diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-02-09 10:18:57 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-02-09 10:18:57 +0100 |
| commit | 217defff002ae4d3146d2fa82544ce1c088bdc90 (patch) | |
| tree | 4633d34ac58f22fdd3bb71ac298933407fa958c1 | |
| parent | b6ec922b75eb95519f1eff7261050a65a81e5927 (diff) | |
| parent | 33156218401ba0ba489d0d787367af82f56c5f3c (diff) | |
| download | otp-217defff002ae4d3146d2fa82544ce1c088bdc90.tar.gz otp-217defff002ae4d3146d2fa82544ce1c088bdc90.tar.bz2 otp-217defff002ae4d3146d2fa82544ce1c088bdc90.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/ssl/src/ssl_manager.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl index d6f96df16e..bf0333ba8d 100644 --- a/lib/ssl/src/ssl_manager.erl +++ b/lib/ssl/src/ssl_manager.erl @@ -230,7 +230,7 @@ init([Name, Opts]) -> session_cache_cb = CacheCb, session_lifetime = SessionLifeTime, session_validation_timer = Timer, - last_pem_check = erlang:timestamp(), + last_pem_check = os:timestamp(), clear_pem_cache = Interval }}. @@ -377,7 +377,7 @@ handle_info({delayed_clean_session, Key, Cache}, #state{session_cache_cb = Cache handle_info(clear_pem_cache, #state{certificate_db = [_,_,PemChace], clear_pem_cache = Interval, last_pem_check = CheckPoint} = State) -> - NewCheckPoint = erlang:timestamp(), + NewCheckPoint = os:timestamp(), start_pem_cache_validator(PemChace, CheckPoint), erlang:send_after(Interval, self(), clear_pem_cache), {noreply, State#state{last_pem_check = NewCheckPoint}}; |