diff options
| author | Ingela Andin <[email protected]> | 2019-01-08 16:07:04 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-01-08 16:07:04 +0100 |
| commit | 92e8629ab97fe86c8a635e83db73c572331c1158 (patch) | |
| tree | 990f3bd59275f8cc721b187716b8b2512a42b5c0 /lib | |
| parent | f08e779f236dc9f5c9760f9630233154cdab0367 (diff) | |
| parent | 0b48b8cac8f75a58a3154ae26f45ebd5e238c8f8 (diff) | |
| download | otp-92e8629ab97fe86c8a635e83db73c572331c1158.tar.gz otp-92e8629ab97fe86c8a635e83db73c572331c1158.tar.bz2 otp-92e8629ab97fe86c8a635e83db73c572331c1158.zip | |
Merge pull request #2070 from essen/fix-ssl-shutdown-crash
ssl: Fix two invalid gen_statem returns
OTP-15505
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 41d853977e..b9162a2d3b 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1193,7 +1193,7 @@ handle_call({shutdown, read_write = How}, From, StateName, ok -> {next_state, StateName, State#state{terminated = true}, [{reply, From, ok}]}; Error -> - {stop, StateName, State#state{terminated = true}, [{reply, From, Error}]} + {stop_and_reply, {shutdown, normal}, {reply, From, Error}, State#state{terminated = true}} end catch throw:Return -> @@ -1206,7 +1206,7 @@ handle_call({shutdown, How0}, From, StateName, ok -> {next_state, StateName, State, [{reply, From, ok}]}; Error -> - {stop, StateName, State, [{reply, From, Error}]} + {stop_and_reply, {shutdown, normal}, {reply, From, Error}, State} end; handle_call({recv, _N, _Timeout}, From, _, #state{socket_options = |