diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-03-08 11:01:28 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-03-08 11:01:28 +0100 |
| commit | f7b6a48eafe54014490719679cbf802e9612984a (patch) | |
| tree | 9740cffecc62bc63c96b717dc0c43939c3c26ae3 /lib/ssl | |
| parent | 0c9d6cb2ab23afb8e4bde0a3fa56fafb0d3a8a27 (diff) | |
| parent | 80bc62dd5f8c80df5bbb30ac7a59cbb301cdb31e (diff) | |
| download | otp-f7b6a48eafe54014490719679cbf802e9612984a.tar.gz otp-f7b6a48eafe54014490719679cbf802e9612984a.tar.bz2 otp-f7b6a48eafe54014490719679cbf802e9612984a.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 422c4c94ae..e5b01cce5f 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -2736,6 +2736,11 @@ ssl_options_list([Key | Keys], [Value | Values], Acc) -> handle_active_option(false, connection = StateName, To, Reply, State) -> hibernate_after(StateName, State, [{reply, To, Reply}]); +handle_active_option(_, connection = StateName, To, _Reply, #state{connection_env = #connection_env{terminated = true}, + user_data_buffer = {_,0,_}} = State) -> + handle_normal_shutdown(?ALERT_REC(?FATAL, ?CLOSE_NOTIFY, all_data_deliverd), StateName, + State#state{start_or_recv_from = To}), + {stop,{shutdown, peer_close}, State}; handle_active_option(_, connection = StateName0, To, Reply, #state{static_env = #static_env{protocol_cb = Connection}, user_data_buffer = {_,0,_}} = State0) -> case Connection:next_event(StateName0, no_record, State0) of |