diff options
| author | Hans Nilsson <[email protected]> | 2017-05-12 10:39:07 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-05-12 10:39:07 +0200 |
| commit | 773c4d4f0416f25e3c0c6939f8d0871dc4486bab (patch) | |
| tree | 942a4a892eee6faad4074b21f69aa852d59f8b23 /lib/ssl/src | |
| parent | 9fcbf829e38f4e63bc238d56d4debe38fde7b051 (diff) | |
| parent | 736de00985c1ed44760e52283eeb727d3f14bb1f (diff) | |
| download | otp-773c4d4f0416f25e3c0c6939f8d0871dc4486bab.tar.gz otp-773c4d4f0416f25e3c0c6939f8d0871dc4486bab.tar.bz2 otp-773c4d4f0416f25e3c0c6939f8d0871dc4486bab.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
lib/inets/vsn.mk
lib/ssl/vsn.mk
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index be64081599..e935e07b65 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -842,7 +842,6 @@ handle_common_event(internal, #change_cipher_spec{type = <<1>>}, StateName, StateName, State); handle_common_event(_Type, Msg, StateName, #state{negotiated_version = Version} = State, _) -> - ct:pal("Unexpected msg ~p", [Msg]), Alert = ?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE), handle_own_alert(Alert, Version, {StateName, Msg}, State). |