diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-12-20 09:51:32 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-12-20 09:51:32 +0100 |
| commit | 12d4c5b8ec6310952ee5e72c4a07b5d6bb2bf724 (patch) | |
| tree | 7b2ee758247a7aef1fcb385fc95f31258b04ecff /lib/ssl/src/ssl_connection.erl | |
| parent | 11b53eb69628f16d2aaa49811fd060ddb1c91295 (diff) | |
| parent | 9aac178d30c5bad940e68a7eb8a36596df5ed903 (diff) | |
| download | otp-12d4c5b8ec6310952ee5e72c4a07b5d6bb2bf724.tar.gz otp-12d4c5b8ec6310952ee5e72c4a07b5d6bb2bf724.tar.bz2 otp-12d4c5b8ec6310952ee5e72c4a07b5d6bb2bf724.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/src/tls_connection.erl
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 afb2ab6020..19186336cb 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1153,7 +1153,7 @@ handle_common_event(internal, {handshake, {#hello_request{} = Handshake, _}}, co handle_common_event(internal, {handshake, {#hello_request{}, _}}, StateName, #state{static_env = #static_env{role = client}}, _) when StateName =/= connection -> - {keep_state_and_data}; + keep_state_and_data; handle_common_event(internal, {handshake, {Handshake, Raw}}, StateName, #state{tls_handshake_history = Hs0} = State0, Connection) -> |