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_connect.hrl | |
| 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_connect.hrl')
| -rw-r--r-- | lib/ssh/src/ssh_connect.hrl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh_connect.hrl b/lib/ssh/src/ssh_connect.hrl index e06c9ea211..932b0642f1 100644 --- a/lib/ssh/src/ssh_connect.hrl +++ b/lib/ssh/src/ssh_connect.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2011. All Rights Reserved. +%% Copyright Ericsson AB 2005-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -253,7 +253,6 @@ -record(connection, { requests = [], %% [{ChannelId, Pid}...] awaiting reply on request, channel_cache, - channel_pids = [], port_bindings, channel_id_seed, cli_spec, @@ -261,5 +260,6 @@ port, options, exec, - sub_system_supervisor + sub_system_supervisor, + connection_supervisor }). |