diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-04-22 09:28:51 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-04-22 09:28:51 +0200 |
| commit | e94575a205cd13db8cc15b000f1689bf33088779 (patch) | |
| tree | 0aa0c47f018c262457d2568256fbf6e5e79ce79f /lib/ssl/src/tls_connection.erl | |
| parent | 89b9d687bbec2324bb3825171479d678e66e9808 (diff) | |
| parent | e438ad522009b37586b6114080ed5341bca5e373 (diff) | |
| download | otp-e94575a205cd13db8cc15b000f1689bf33088779.tar.gz otp-e94575a205cd13db8cc15b000f1689bf33088779.tar.bz2 otp-e94575a205cd13db8cc15b000f1689bf33088779.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 5 |
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), |