diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-10-06 12:12:50 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-10-06 12:12:50 +0200 |
| commit | f0d7db28c079a47425aa118e960cb2b914a85b29 (patch) | |
| tree | d2a1bc54bf37f5eefd21becf8da583d3905cd4e8 /lib/ssh/src/ssh_channel.erl | |
| parent | 88acd9cbdea2b342206b7a2e5ba8b904dbfd10a7 (diff) | |
| parent | 5acfcf3758f89ba32d44807cd8cb406a55d39836 (diff) | |
| download | otp-f0d7db28c079a47425aa118e960cb2b914a85b29.tar.gz otp-f0d7db28c079a47425aa118e960cb2b914a85b29.tar.bz2 otp-f0d7db28c079a47425aa118e960cb2b914a85b29.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/ssh/src/ssh_channel.erl')
| -rw-r--r-- | lib/ssh/src/ssh_channel.erl | 7 |
1 files changed, 6 insertions, 1 deletions
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). |