diff options
author | Björn Gustavsson <[email protected]> | 2010-08-25 11:24:24 +0200 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2010-08-25 11:24:24 +0200 |
commit | 1b4a6172d8d2df4362d6d084daef02804e10ebb6 (patch) | |
tree | bebdac2e98dc989b17f2fdf85b996f2454689e04 /lib/ssh/src/ssh_channel.erl | |
parent | 3f11eeaaedf24d15c3a6e8cb19d8421e57d14962 (diff) | |
parent | 6c00708e21bccffff84595f714cf9c1003cc8916 (diff) | |
download | otp-1b4a6172d8d2df4362d6d084daef02804e10ebb6.tar.gz otp-1b4a6172d8d2df4362d6d084daef02804e10ebb6.tar.bz2 otp-1b4a6172d8d2df4362d6d084daef02804e10ebb6.zip |
Merge branch 'maint-r13' into dev
* maint-r13:
snmp: Patch 1130
inets: Patch 1129
ssh: Patch 1127
ssh: Patch 1126
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
lib/inets/vsn.mk
lib/snmp/vsn.mk
lib/ssh/doc/src/notes.xml
lib/ssh/src/ssh.appup.src
lib/ssh/vsn.mk
Diffstat (limited to 'lib/ssh/src/ssh_channel.erl')
-rw-r--r-- | lib/ssh/src/ssh_channel.erl | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_channel.erl b/lib/ssh/src/ssh_channel.erl index 8a49a44a6c..dcb2d69290 100644 --- a/lib/ssh/src/ssh_channel.erl +++ b/lib/ssh/src/ssh_channel.erl @@ -238,9 +238,19 @@ handle_info(Msg, #state{cm = ConnectionManager, channel_cb = Module, {noreply, State#state{channel_state = ChannelState}}; {ok, ChannelState, Timeout} -> {noreply, State#state{channel_state = ChannelState}, Timeout}; + {stop, Reason, ChannelState} when is_atom(Reason)-> + {stop, Reason, State#state{close_sent = true, + channel_state = ChannelState}}; {stop, ChannelId, ChannelState} -> - ssh_connection:close(ConnectionManager, ChannelId), - {stop, normal, State#state{close_sent = true, + Reason = + case Msg of + {'EXIT', _Pid, shutdown} -> + shutdown; + _ -> + normal + end, + (catch ssh_connection:close(ConnectionManager, ChannelId)), + {stop, Reason, State#state{close_sent = true, channel_state = ChannelState}} end. |