diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-11-27 11:05:35 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-12-02 09:50:28 +0100 |
| commit | 174b36ae2755b501e2b3152f6b00e9c59a90e848 (patch) | |
| tree | 2be254c040f5c83ffaf1ecbcf650e6d06acbc8da | |
| parent | 1b6cb772ce5d1d1b7ce280c22e6a8d2ceb8165ed (diff) | |
| download | otp-174b36ae2755b501e2b3152f6b00e9c59a90e848.tar.gz otp-174b36ae2755b501e2b3152f6b00e9c59a90e848.tar.bz2 otp-174b36ae2755b501e2b3152f6b00e9c59a90e848.zip | |
ssl: Trap exits
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 7 | ||||
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 8dac0a3f12..b7c1b9e8d0 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -822,6 +822,13 @@ handle_info({'DOWN', MonitorRef, _, _, _}, _, State = #state{user_application={MonitorRef,_Pid}}) -> {stop, normal, State}; +%%% So that terminate will be run when supervisor issues shutdown +handle_info({'EXIT', _Sup, shutdown}, _StateName, State) -> + {stop, shutdown, State}; +handle_info({'EXIT', Socket, normal}, _StateName, #state{socket = Socket} = State) -> + %% Handle as transport close" + {stop, {shutdown, transport_closed}, State}; + handle_info(allow_renegotiate, StateName, State) -> {next_state, StateName, State#state{allow_renegotiate = true}, get_timeout(State)}; diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 9621182948..8e6f80da1e 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -145,6 +145,7 @@ start_link(Role, Host, Port, Socket, Options, User, CbInfo) -> {ok, proc_lib:spawn_link(?MODULE, init, [[Role, Host, Port, Socket, Options, User, CbInfo]])}. init([Role, Host, Port, Socket, {SSLOpts0, _} = Options, User, CbInfo]) -> + process_flag(trap_exit, true), State0 = initial_state(Role, Host, Port, Socket, Options, User, CbInfo), Handshake = ssl_handshake:init_handshake_history(), TimeStamp = calendar:datetime_to_gregorian_seconds({date(), time()}), |