diff options
| author | Erlang/OTP <[email protected]> | 2010-10-21 14:11:17 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-10-21 14:11:17 +0200 |
| commit | c97c93401f18021907a79719bf35c2f937f57fcf (patch) | |
| tree | a46e61db693e79b13633da1172987817882e7447 /lib/ssh/src/ssh_connection_controler.erl | |
| parent | c219fb35d73ad393d983fd8b47a127d03cbc41c5 (diff) | |
| parent | fddc1ed0341d13df8373509fa063d889fab8d219 (diff) | |
| download | otp-c97c93401f18021907a79719bf35c2f937f57fcf.tar.gz otp-c97c93401f18021907a79719bf35c2f937f57fcf.tar.bz2 otp-c97c93401f18021907a79719bf35c2f937f57fcf.zip | |
Merge branch 'nick/ssh/fix-process-leak/OTP-8807' into maint-r13
* nick/ssh/fix-process-leak/OTP-8807:
Fix race condition when terminating a connection.
fix process leak in ssh_system_sup (dynamicaly created childs where not cleaned up)
Diffstat (limited to 'lib/ssh/src/ssh_connection_controler.erl')
| -rw-r--r-- | lib/ssh/src/ssh_connection_controler.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_connection_controler.erl b/lib/ssh/src/ssh_connection_controler.erl index 636ecba532..ca3e62dc83 100644 --- a/lib/ssh/src/ssh_connection_controler.erl +++ b/lib/ssh/src/ssh_connection_controler.erl @@ -126,8 +126,8 @@ handle_cast(_, State) -> %% handle_info(ssh_connected, State) -> %% {stop, normal, State}; %% Servant termination. -handle_info({'EXIT', _Pid, normal}, State) -> - {stop, normal, State}. +handle_info({'EXIT', _Pid, Reason}, State) -> + {stop, Reason, State}. %%----------------------------------------------------------------- %% Func: code_change/3 |