diff options
| author | Erlang/OTP <[email protected]> | 2011-01-24 08:42:57 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2011-01-24 08:42:57 +0100 |
| commit | a55a1a82aa398d75152bb96ad6274b656ca58fa5 (patch) | |
| tree | 4d4ed1ef0eaef7173bc67fb895ee0e5b4731f0b5 /lib/ssh/src/ssh_connection_manager.erl | |
| parent | 7db8499d81b8c05d6019df9cf923351d0e96f7a0 (diff) | |
| parent | afdb12f28b7b66452dd0bd83c8f539aee4e61ed9 (diff) | |
| download | otp-a55a1a82aa398d75152bb96ad6274b656ca58fa5.tar.gz otp-a55a1a82aa398d75152bb96ad6274b656ca58fa5.tar.bz2 otp-a55a1a82aa398d75152bb96ad6274b656ca58fa5.zip | |
Merge branch 'nick/ssh/sign-verify-binary' into maint-r14
* nick/ssh/sign-verify-binary:
Updated appup file.
Updated notes file.
Changed year in copyright header.
Added updated modules to the appup file.
Improved error handling for ssh:connect/3/4.
Release note contained wrong ticker number.
OTP-8987 In some cases SSH returned {error, normal} when a channel was terminated unexpectedly. This has now been changed to {error, channel_closed}.
Diffstat (limited to 'lib/ssh/src/ssh_connection_manager.erl')
| -rw-r--r-- | lib/ssh/src/ssh_connection_manager.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl index 6bf89224cf..9bfd5270da 100644 --- a/lib/ssh/src/ssh_connection_manager.erl +++ b/lib/ssh/src/ssh_connection_manager.erl @@ -147,7 +147,7 @@ close(ConnectionManager, ChannelId) -> try call(ConnectionManager, {close, ChannelId}) of ok -> ok; - {error,normal} -> + {error, channel_closed} -> ok catch exit:{noproc, _} -> @@ -158,7 +158,7 @@ stop(ConnectionManager) -> try call(ConnectionManager, stop) of ok -> ok; - {error,normal} -> + {error, channel_closed} -> ok catch exit:{noproc, _} -> @@ -604,7 +604,7 @@ call(Pid, Msg, Timeout) -> exit:{timeout, _} -> {error, timeout}; exit:{normal, _} -> - {error, normal} + {error, channel_closed} end. cast(Pid, Msg) -> |