diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-12-07 10:35:19 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-12-07 10:35:19 +0100 |
| commit | f258633921e7dd0bd5760281d2a26a0f937e53c4 (patch) | |
| tree | 8c6e16902035cbf583c1325c84bfb8f2b118f8cc /lib/ssl/src/ssl_connection.erl | |
| parent | 1d1677c2a85ebce0ada828d254c7a1122b825e0a (diff) | |
| parent | 55569124ac815eedc21c234c447e346b97f3c8fe (diff) | |
| download | otp-f258633921e7dd0bd5760281d2a26a0f937e53c4.tar.gz otp-f258633921e7dd0bd5760281d2a26a0f937e53c4.tar.bz2 otp-f258633921e7dd0bd5760281d2a26a0f937e53c4.zip | |
Merge branch 'ia/ssl/max-sessions/OTP-12392' into maint
* ia/ssl/max-sessions/OTP-12392:
ssl: Fix documentation mistakes
ssl: Add upper limit for session cache
ssl: Measure elapsed time with erlang:monotonic_time
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 12a56df69f..241871dc38 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -974,7 +974,7 @@ ssl_config(Opts, Role, State) -> {ok, Ref, CertDbHandle, FileRefHandle, CacheHandle, CRLDbInfo, OwnCert, Key, DHParams} = ssl_config:init(Opts, Role), Handshake = ssl_handshake:init_handshake_history(), - TimeStamp = calendar:datetime_to_gregorian_seconds({date(), time()}), + TimeStamp = erlang:monotonic_time(), Session = State#state.session, State#state{tls_handshake_history = Handshake, session = Session#session{own_certificate = OwnCert, |