From 68263a48bfbdac4dc219a91f06af3d535d881850 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Tue, 15 Oct 2013 18:24:50 +0200
Subject: ssh: Merge connection_manager and connection_handler processes

Also start adding dialyzer specs and removing dead code
---
 lib/ssh/src/ssh_system_sup.erl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/ssh/src/ssh_system_sup.erl')

diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl
index 36daf3b1ac..158a829eb0 100644
--- a/lib/ssh/src/ssh_system_sup.erl
+++ b/lib/ssh/src/ssh_system_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. 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
@@ -40,7 +40,7 @@
 -export([init/1]).
 
 %%%=========================================================================
-%%%  API
+%%% Internal  API
 %%%=========================================================================
 start_link(ServerOpts) ->
     Address = proplists:get_value(address, ServerOpts),
@@ -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 = transient, 
+    Restart = temporary,
     Shutdown = infinity,
     Modules = [ssh_subsystem_sup],
     Type = supervisor,
-- 
cgit v1.2.3


From 32102f1e8225dada7526c9bfee6622f9026ba4cd Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Tue, 12 Nov 2013 16:57:29 +0100
Subject: ssh: Quicker shutdown of an ssh dameon

OTP-11339
---
 lib/ssh/src/ssh_system_sup.erl | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'lib/ssh/src/ssh_system_sup.erl')

diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl
index 158a829eb0..bf3c12a988 100644
--- a/lib/ssh/src/ssh_system_sup.erl
+++ b/lib/ssh/src/ssh_system_sup.erl
@@ -55,13 +55,12 @@ stop_listener(Address, Port) ->
     Name = make_name(Address, Port),
     stop_acceptor(whereis(Name)). 
 
-stop_system(SysSup) ->
-    Name = sshd_sup:system_name(SysSup),
-    sshd_sup:stop_child(Name).
-    
-stop_system(Address, Port) -> 
-    sshd_sup:stop_child(Address, Port).
+stop_system(SysSup) when is_pid(SysSup)->
+    exit(SysSup, shutdown).
 
+stop_system(Address, Port) -> 
+    stop_system(system_supervisor(Address, Port)).
+    
 system_supervisor(Address, Port) ->
     Name = make_name(Address, Port),
     whereis(Name).
@@ -121,7 +120,7 @@ restart_acceptor(Address, Port) ->
 %%%=========================================================================
 init([ServerOpts]) ->
     RestartStrategy = one_for_one,
-    MaxR = 10,
+    MaxR = 0,
     MaxT = 3600,
     Children = child_specs(ServerOpts),
     {ok, {{RestartStrategy, MaxR, MaxT}, Children}}.
-- 
cgit v1.2.3