diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-10-06 12:10:48 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-10-06 12:10:48 +0200 |
| commit | 5acfcf3758f89ba32d44807cd8cb406a55d39836 (patch) | |
| tree | 7a895b390857ece887af32e430fdf0ad02f171af /lib/ssh/src | |
| parent | 05be21eb0ad09fcdd63d955ed1d5b50ed34af925 (diff) | |
| parent | 7a5356d99d8f01572b67305cc9a86446fad351e3 (diff) | |
| download | otp-5acfcf3758f89ba32d44807cd8cb406a55d39836.tar.gz otp-5acfcf3758f89ba32d44807cd8cb406a55d39836.tar.bz2 otp-5acfcf3758f89ba32d44807cd8cb406a55d39836.zip | |
Merge branch 'maint-19' into maint
Diffstat (limited to 'lib/ssh/src')
| -rw-r--r-- | lib/ssh/src/ssh.appup.src | 4 | ||||
| -rw-r--r-- | lib/ssh/src/ssh_channel.erl | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index e38cecf226..4cda8fee95 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -20,9 +20,13 @@ {"%VSN%", [ + {<<"4.3.2">>, [{load_module, ssh_channel, soft_purge, soft_purge, []} + ]}, {<<".*">>, [{restart_application, ssh}]} ], [ + {<<"4.3.2">>, [{load_module, ssh_channel, soft_purge, soft_purge, []} + ]}, {<<".*">>, [{restart_application, ssh}]} ] }. diff --git a/lib/ssh/src/ssh_channel.erl b/lib/ssh/src/ssh_channel.erl index a8e6ebde16..426e2f5125 100644 --- a/lib/ssh/src/ssh_channel.erl +++ b/lib/ssh/src/ssh_channel.erl @@ -93,11 +93,16 @@ call(ChannelPid, Msg, TimeOute) -> catch exit:{noproc, _} -> {error, closed}; + exit:{normal, _} -> + {error, closed}; + exit:{shutdown, _} -> + {error, closed}; + exit:{{shutdown, _}, _} -> + {error, closed}; exit:{timeout, _} -> {error, timeout} end. - cast(ChannelPid, Msg) -> gen_server:cast(ChannelPid, Msg). |