aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-04-14 10:35:18 +0200
committerHans Nilsson <[email protected]>2018-04-17 10:31:09 +0200
commit94f3ce9d6a649dfab810105036f0ff0e73e3837c (patch)
tree8f7e509ae86704df80825eb322fd849af970e983 /lib/ssh/src
parentc5ee502e6031986983d3596745cad7fd547fd9c2 (diff)
downloadotp-94f3ce9d6a649dfab810105036f0ff0e73e3837c.tar.gz
otp-94f3ce9d6a649dfab810105036f0ff0e73e3837c.tar.bz2
otp-94f3ce9d6a649dfab810105036f0ff0e73e3837c.zip
ssh: Fix server crashes for exit-normal signals
Diffstat (limited to 'lib/ssh/src')
-rw-r--r--lib/ssh/src/ssh_connection_handler.erl17
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index e11d3adee4..ad23d82ea8 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -1379,8 +1379,21 @@ handle_event(info, {'DOWN', _Ref, process, ChannelPid, _Reason}, _, D0) ->
{keep_state, D, Repls};
%%% So that terminate will be run when supervisor is shutdown
-handle_event(info, {'EXIT', _Sup, Reason}, _, _) ->
- {stop, {shutdown, Reason}};
+handle_event(info, {'EXIT', _Sup, Reason}, StateName, _) ->
+ Role = role(StateName),
+ if
+ Role == client ->
+ %% OTP-8111 tells this function clause fixes a problem in
+ %% clients, but there were no check for that role.
+ {stop, {shutdown, Reason}};
+
+ Reason == normal ->
+ %% An exit normal should not cause a server to crash. This has happend...
+ keep_state_and_data;
+
+ true ->
+ {stop, {shutdown, Reason}}
+ end;
handle_event(info, check_cache, _, D) ->
{keep_state, cache_check_set_idle_timer(D)};