Merge branch 'maint-r14' into dev

5 files changed, 50 insertions, 8 deletions

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 950c249e72..01478f870e 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -29,8 +29,39 @@
     <file>notes.xml</file>
   </header>
 
- <section><title>Ssh 2.0.1</title>
+ <section><title>Ssh 2.0.2</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+            The ssh_system_sup did not catch noproc and shutdown
+            messages.</p>
+          <p>
+            Own Id: OTP-8863</p>
+        </item>
+        <item>
+          <p>
+            In some cases a crash report was generated when a
+            connection was closing down. This was caused by a race
+            condition between two processes.</p>
+          <p>
+            Own Id: OTP-8881 Aux Id: seq11656, seq11648 </p>
+        </item>
+      </list>
+    </section>
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+            SSH no longer use deprecated public_key functions.</p>
+          <p>
+            Own Id: OTP-8849</p>
+        </item>
+      </list>
+    </section>
+ </section>
 
+ <section><title>Ssh 2.0.1</title>
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
         <item>
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 21f7508555..619b4b736f 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,9 +19,11 @@
 
 {"%VSN%",	
  [
+  {"2.0.1", [{restart_application, ssh}]}
  ],
  [
- ] 
+  {"2.0.1", [{restart_application, ssh}]}
+ ]
 }.
 
 
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index d46002c494..0ba11b0a26 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -705,11 +705,19 @@ generate_event(<<?BYTE(Byte), _/binary>> = Msg, StateName,
 	Byte == ?SSH_MSG_CHANNEL_REQUEST;
 	Byte == ?SSH_MSG_CHANNEL_SUCCESS;
 	Byte == ?SSH_MSG_CHANNEL_FAILURE ->
-    ssh_connection_manager:event(Pid, Msg),
-    State = generate_event_new_state(State0, EncData),
-    next_packet(State),
-    {next_state, StateName, State};
 
+    try 
+	ssh_connection_manager:event(Pid, Msg),
+	State = generate_event_new_state(State0, EncData),
+	next_packet(State),
+	{next_state, StateName, State}
+    catch
+	exit:{noproc, _Reason} ->
+	    Report = io_lib:format("~p Connection Handler terminated: ~p~n",
+				   [self(), Pid]),
+	    error_logger:info_report(Report),
+	    {stop, normal, State0}
+    end;
 generate_event(Msg, StateName, State0, EncData) ->
     Event = ssh_bits:decode(Msg),
     State = generate_event_new_state(State0, EncData),
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl
index f4570b8a48..920baaadef 100644
--- a/lib/ssh/src/ssh_system_sup.erl
+++ b/lib/ssh/src/ssh_system_sup.erl
@@ -85,7 +85,7 @@ start_subsystem(SystemSup, Options) ->
     supervisor:start_child(SystemSup, Spec).
 
 stop_subsystem(SystemSup, SubSys) ->
-    case lists:keyfind(SubSys, 2, supervisor:which_children(SystemSup)) of
+    case catch lists:keyfind(SubSys, 2, supervisor:which_children(SystemSup)) of
 	false ->
 	    {error, not_found};
 	{Id, _, _, _} ->
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 79fd36cd83..5e92c5ea01 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,4 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 2.0.1
+SSH_VSN = 2.0.2
 APP_VSN    = "ssh-$(SSH_VSN)"
+