diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-08-30 17:53:26 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-08-30 17:53:26 +0200 |
| commit | 50d5e1018d5de108098aaeb7e6afeec24d847478 (patch) | |
| tree | cf97f8bb69e001dd046e36fc084a1c36b013ae2a /lib | |
| parent | 0fdeceb94ea64ddaca4155298d8c33369b8f0f04 (diff) | |
| parent | 6db81adf16619e5378dc324d34c8d35a48506e2a (diff) | |
| download | otp-50d5e1018d5de108098aaeb7e6afeec24d847478.tar.gz otp-50d5e1018d5de108098aaeb7e6afeec24d847478.tar.bz2 otp-50d5e1018d5de108098aaeb7e6afeec24d847478.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index adee59393e..8a990870e8 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -824,8 +824,6 @@ handle_common_event(internal, #change_cipher_spec{type = <<1>>}, StateName, #state{negotiated_version = Version} = State, Connection) -> Connection:handle_own_alert(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE), Version, StateName, State); -handle_common_event(internal, _, _, _, _) -> - {keep_state_and_data, [postpone]}; handle_common_event(_Type, Msg, StateName, #state{negotiated_version = Version} = State, Connection) -> Alert = ?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE), |