aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2019-01-24 15:35:00 +0100
committerIngela Anderton Andin <[email protected]>2019-01-24 15:35:00 +0100
commitf85cfeb16776467dae4c0c870b0c30a684bd09bd (patch)
tree987bfaeabc7e0ab8f8256e80527b7e211f46b20a /lib/ssl
parenta4aeacd28e4e31d3d79b091afcdc528082be2865 (diff)
downloadotp-f85cfeb16776467dae4c0c870b0c30a684bd09bd.tar.gz
otp-f85cfeb16776467dae4c0c870b0c30a684bd09bd.tar.bz2
otp-f85cfeb16776467dae4c0c870b0c30a684bd09bd.zip
ssl: Correct check for delayed close due to undliverd data
Could cause connection processes not terminate when they should
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/src/tls_connection.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index e034cb20e9..80c1a74ce7 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -923,6 +923,7 @@ handle_alerts(_, {stop, _, _} = Stop) ->
Stop;
handle_alerts([#alert{level = ?WARNING, description = ?CLOSE_NOTIFY} | _Alerts],
{next_state, connection = StateName, #state{user_data_buffer = Buffer,
+ socket_options = #socket_options{active = false},
protocol_buffers = #protocol_buffers{tls_cipher_texts = CTs}} =
State}) when (Buffer =/= <<>>) orelse
(CTs =/= []) ->