diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-03-08 11:00:51 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-03-08 11:00:51 +0100 |
| commit | 80bc62dd5f8c80df5bbb30ac7a59cbb301cdb31e (patch) | |
| tree | 630592095a3734ea7413e1472679e3a280988e1b /lib/ssl/src | |
| parent | 23ecfc137a2e0559b56b2467121f33eb9c3d7c00 (diff) | |
| parent | ca46b31327072c88140e5434b29fa826fc3d47ad (diff) | |
| download | otp-80bc62dd5f8c80df5bbb30ac7a59cbb301cdb31e.tar.gz otp-80bc62dd5f8c80df5bbb30ac7a59cbb301cdb31e.tar.bz2 otp-80bc62dd5f8c80df5bbb30ac7a59cbb301cdb31e.zip | |
Merge branch 'ingela/ssl/ftp/continue/chunk-timing/ERIERL-316/OTP-15666' into maint
* ingela/ssl/ftp/continue/chunk-timing/ERIERL-316/OTP-15666:
ssl: Correct active once emulation
ftp: New test case
Diffstat (limited to 'lib/ssl/src')
| -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 24fb091ddf..ad81288f64 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -2691,6 +2691,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 |