diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-01-30 09:53:11 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-01-30 09:53:11 +0100 |
| commit | 5904e27d7b6f1e71e60542322271e916623d71c5 (patch) | |
| tree | 652476852d536fdd3f070f92fb53ea7736a06110 /lib/ssl | |
| parent | 2728fca4040109fd02c3efb2e795b5f4e491cc36 (diff) | |
| parent | 71e7b98034ac00d9ee5428ed0602646e29851a29 (diff) | |
| download | otp-5904e27d7b6f1e71e60542322271e916623d71c5.tar.gz otp-5904e27d7b6f1e71e60542322271e916623d71c5.tar.bz2 otp-5904e27d7b6f1e71e60542322271e916623d71c5.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 26f9fc99d3..b3389def22 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -1104,6 +1104,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 =/= []) -> |