diff options
| author | Erlang/OTP <[email protected]> | 2016-03-10 13:10:32 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-03-10 13:10:32 +0100 |
| commit | d5ea95b5bc1d334ecac312da7e8d92ee1e81377a (patch) | |
| tree | 8be835cd4b0564e7787a2b3cb8913b5fea044457 /lib/ssl/src/tls_connection.erl | |
| parent | 05cef5e3a267b3515acb834130675e0cbf69bf78 (diff) | |
| parent | 2c7cee6ae55fbcb8e5f84caa3920420506c3a317 (diff) | |
| download | otp-d5ea95b5bc1d334ecac312da7e8d92ee1e81377a.tar.gz otp-d5ea95b5bc1d334ecac312da7e8d92ee1e81377a.tar.bz2 otp-d5ea95b5bc1d334ecac312da7e8d92ee1e81377a.zip | |
Merge branch 'keynslug/fix_instant_hibernate_after' into maint-17
* keynslug/fix_instant_hibernate_after:
ssl: fix hibernate_after with short timeouts
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 77d3aa7889..887fb8fda1 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -202,7 +202,7 @@ hello(Hello = #client_hello{client_version = ClientVersion, #alert{} = Alert -> handle_own_alert(Alert, ClientVersion, hello, State) end; -hello(Hello, +hello(Hello = #server_hello{}, #state{connection_states = ConnectionStates0, negotiated_version = ReqVersion, role = client, |