diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-02-22 12:07:11 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-02-28 10:26:56 +0100 |
| commit | 1aeb8f4234b52705f9a933abf8dcd1afb2296b9d (patch) | |
| tree | 1b866333a0d627ff2e321d638ace080098f2f6ce /lib/ssh/src/ssh_connection.erl | |
| parent | 76cf3d914cadc98ead9889b66d2812a46fb5d5b2 (diff) | |
| download | otp-1aeb8f4234b52705f9a933abf8dcd1afb2296b9d.tar.gz otp-1aeb8f4234b52705f9a933abf8dcd1afb2296b9d.tar.bz2 otp-1aeb8f4234b52705f9a933abf8dcd1afb2296b9d.zip | |
Prevent client hanging. (OTP-8111)
Restored supervisor tree so that error propagation will work as
intended, although connection processes are set to temporary, instead
of permanent with restart times set to 0, and termination of the
connection subtree is initiated by a temporary process spawned by
ssh_connection_managers terminate. This is done to avoid unwanted
supervisor reports. Pherhaps we need some new supervisor
functionality.
Diffstat (limited to 'lib/ssh/src/ssh_connection.erl')
| -rw-r--r-- | lib/ssh/src/ssh_connection.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl index cb02d7b824..46f0c7e688 100644 --- a/lib/ssh/src/ssh_connection.erl +++ b/lib/ssh/src/ssh_connection.erl @@ -744,8 +744,8 @@ handle_msg(#ssh_msg_global_request{name = _Type, %%% This transport message will also be handled at the connection level handle_msg(#ssh_msg_disconnect{code = Code, - description = Description, - language = _Lang }, + description = Description, + language = _Lang }, #connection{channel_cache = Cache} = Connection0, _, _) -> {Connection, Replies} = ssh_channel:cache_foldl(fun(Channel, {Connection1, Acc}) -> @@ -779,7 +779,7 @@ handle_cli_msg(#connection{channel_cache = Cache} = Connection0, handle_cli_msg(Connection0, _, Channel, Reply0) -> {Reply, Connection} = reply_msg(Channel, Connection0, Reply0), {{replies, [Reply]}, Connection}. - + channel_eof_msg(ChannelId) -> #ssh_msg_channel_eof{recipient_channel = ChannelId}. |