diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-12-14 09:18:03 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-12-14 09:18:03 +0100 |
| commit | 745159c619dbcb53a54acab3d3482311439a57fc (patch) | |
| tree | adf2649c4838948dbe4c330939ca6e821981cd11 /lib/ssl/src | |
| parent | a8eb7811370127e838ab9a27c33e518a8bfa1272 (diff) | |
| parent | 4f13b9838c5f7e182661398418065b09716034f2 (diff) | |
| download | otp-745159c619dbcb53a54acab3d3482311439a57fc.tar.gz otp-745159c619dbcb53a54acab3d3482311439a57fc.tar.bz2 otp-745159c619dbcb53a54acab3d3482311439a57fc.zip | |
Merge branch 'ia/pr/919/OTP-13189' into maint
* ia/pr/919/OTP-13189:
ssl: fix hibernate_after with instant or near instant timeouts
Diffstat (limited to 'lib/ssl/src')
| -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 a468c131ce..b2b85eaf8d 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -212,7 +212,7 @@ hello(Hello = #client_hello{client_version = ClientVersion, client_ecc = {EllipticCurves, EcPointFormats}, negotiated_protocol = Protocol}, ?MODULE) end; -hello(Hello, +hello(Hello = #server_hello{}, #state{connection_states = ConnectionStates0, negotiated_version = ReqVersion, role = client, |