diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-08-30 17:52:29 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-08-30 17:52:29 +0200 |
| commit | 6db81adf16619e5378dc324d34c8d35a48506e2a (patch) | |
| tree | 8131b570a4442aa375e60400320e5611f2625a71 /lib/ssl/src | |
| parent | 182ffd5e09a381e54f2ddb5687f74cca059b0f28 (diff) | |
| parent | 57b250922f9016b5a5116e94f1c0c376d128bd80 (diff) | |
| download | otp-6db81adf16619e5378dc324d34c8d35a48506e2a.tar.gz otp-6db81adf16619e5378dc324d34c8d35a48506e2a.tar.bz2 otp-6db81adf16619e5378dc324d34c8d35a48506e2a.zip | |
Merge branch 'ingela/ssl/ERL-232/OTP-13853' into maint
* ingela/ssl/ERL-232/OTP-13853:
ssl: Remove clause that postponed unexpected messages
Diffstat (limited to 'lib/ssl/src')
| -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), |