diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-02-28 10:30:17 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-02-28 10:30:17 +0100 |
| commit | 06add1440f977f4c392040d41350268610fd4faf (patch) | |
| tree | 6aa7edc3be25b677e02b556d4781bade4e5ca12c /lib/ssh/src/ssh_system_sup.erl | |
| parent | 583585888569522b2380652c5cd4b7197f09523c (diff) | |
| parent | bc50e697fbf392c99842d823eb67a564e1759376 (diff) | |
| download | otp-06add1440f977f4c392040d41350268610fd4faf.tar.gz otp-06add1440f977f4c392040d41350268610fd4faf.tar.bz2 otp-06add1440f977f4c392040d41350268610fd4faf.zip | |
Merge remote branch 'upstream/maint'
* upstream/maint:
Prevent client hanging. (OTP-8111)
Added checks of API input
Improve check so that we will not try to read ssh packet length indicator if not sure we have enough data.
Improved error handling
Diffstat (limited to 'lib/ssh/src/ssh_system_sup.erl')
| -rw-r--r-- | lib/ssh/src/ssh_system_sup.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl index 920baaadef..23480f5fe3 100644 --- a/lib/ssh/src/ssh_system_sup.erl +++ b/lib/ssh/src/ssh_system_sup.erl @@ -146,7 +146,7 @@ ssh_acceptor_child_spec(ServerOpts) -> ssh_subsystem_child_spec(ServerOpts) -> Name = make_ref(), StartFunc = {ssh_subsystem_sup, start_link, [ServerOpts]}, - Restart = temporary, + Restart = transient, Shutdown = infinity, Modules = [ssh_subsystem_sup], Type = supervisor, |