diff options
| author | Ingela Andin <[email protected]> | 2019-01-30 09:48:35 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-01-30 09:48:35 +0100 |
| commit | 71e7b98034ac00d9ee5428ed0602646e29851a29 (patch) | |
| tree | 981abd64ee459c3b11dc0200849b577f13e718d6 | |
| parent | b2bc7542fb545c643baa81833a39f1865f95e53f (diff) | |
| parent | f85cfeb16776467dae4c0c870b0c30a684bd09bd (diff) | |
| download | otp-71e7b98034ac00d9ee5428ed0602646e29851a29.tar.gz otp-71e7b98034ac00d9ee5428ed0602646e29851a29.tar.bz2 otp-71e7b98034ac00d9ee5428ed0602646e29851a29.zip | |
Merge pull request #2109 from IngelaAndin/ingela/ssl/active-check
ssl: Correct check for delayed close due to undliverd data
| -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 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 =/= []) -> |