diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-01-08 16:16:50 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-01-08 16:16:50 +0100 |
| commit | a9235a9545f352805e462a29c14d14554894effc (patch) | |
| tree | 15bdb9e842f3ed6a687ae8e467fd62706f81b0a3 /lib/ssl | |
| parent | c31ebd0ec2025208fb9a25248ec1c41d101cb74e (diff) | |
| parent | 92e8629ab97fe86c8a635e83db73c572331c1158 (diff) | |
| download | otp-a9235a9545f352805e462a29c14d14554894effc.tar.gz otp-a9235a9545f352805e462a29c14d14554894effc.tar.bz2 otp-a9235a9545f352805e462a29c14d14554894effc.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl')
| -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 19186336cb..d534df7ee0 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1199,7 +1199,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 -> @@ -1212,7 +1212,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 = |