aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-04-22 09:07:56 +0200
committerIngela Anderton Andin <[email protected]>2014-04-22 09:07:56 +0200
commit5e97d7cdb359b500fa0268679b343f0258707f28 (patch)
tree66f7ace1dc0191997290806982fd9be262a61f6a /lib/ssl
parente67f9be6f04ea2e15250e1015c1a532705c3a534 (diff)
parent42884b9925d3d023ac99f0d70e4de4f38f7bae44 (diff)
downloadotp-5e97d7cdb359b500fa0268679b343f0258707f28.tar.gz
otp-5e97d7cdb359b500fa0268679b343f0258707f28.tar.bz2
otp-5e97d7cdb359b500fa0268679b343f0258707f28.zip
Merge branch 'ia/ssl/warning-alert/OTP-11874' into maint
* ia/ssl/warning-alert/OTP-11874: ssl: Graceful handling of warning alerts
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/src/tls_connection.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index ffa04ee8ba..c3171da566 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2014. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -859,7 +859,8 @@ handle_alert(#alert{level = ?WARNING, description = ?NO_RENEGOTIATION} = Alert,
{Record, State} = next_record(State0),
next_state(StateName, connection, Record, State);
-handle_alert(#alert{level = ?WARNING, description = ?USER_CANCELED} = Alert, StateName,
+%% Gracefully log and ignore all other warning alerts
+handle_alert(#alert{level = ?WARNING} = Alert, StateName,
#state{ssl_options = SslOpts} = State0) ->
log_alert(SslOpts#ssl_options.log_alert, StateName, Alert),
{Record, State} = next_record(State0),