From 24c67e110e2219c269454566126ad0885ee57bdc Mon Sep 17 00:00:00 2001
From: Niclas Eklund <nick@erlang.org>
Date: Wed, 6 Oct 2010 15:19:22 +0200
Subject: In some cases a crash report was generated when a connection was
 closing down. This was caused by a race condition between two processes.

---
 lib/ssh/src/ssh.appup.src              | 12 ++++++------
 lib/ssh/src/ssh_connection_handler.erl | 16 ++++++++++++----
 lib/ssh/vsn.mk                         |  7 +++++--
 3 files changed, 23 insertions(+), 12 deletions(-)

(limited to 'lib/ssh')

diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 82114c9afd..09249e5e39 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,9 +19,9 @@
 
 {"%VSN%",	
  [
-  {"1.1.10", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
-  {"1.1.9", [{load_module, ssh_channel, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
+  {"1.1.11", [{restart_application, ssh}]},
+  {"1.1.10", [{restart_application, ssh}]},
+  {"1.1.9", [{restart_application, ssh}]},
   {"1.1.8", [{restart_application, ssh}]},
   {"1.1.7", [{restart_application, ssh}]},
   {"1.1.6", [{restart_application, ssh}]},
@@ -31,9 +31,9 @@
   {"1.1.2", [{restart_application, ssh}]}
  ],
  [
-  {"1.1.10", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
-  {"1.1.9", [{load_module, ssh_channel, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
+  {"1.1.11", [{restart_application, ssh}]},
+  {"1.1.10", [{restart_application, ssh}]},
+  {"1.1.9", [{restart_application, ssh}]},
   {"1.1.8", [{restart_application, ssh}]},
   {"1.1.7", [{restart_application, ssh}]},
   {"1.1.6", [{restart_application, ssh}]},
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 822ef8f8f9..926d4fddce 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/vsn.mk b/lib/ssh/vsn.mk
index 8e31851a8e..cf90e3b11e 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,9 +1,12 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 1.1.11
+SSH_VSN = 1.1.12
 APP_VSN    = "ssh-$(SSH_VSN)"
 
-TICKETS = OTP-8735
+TICKETS = OTP-8807 \
+	OTP-8881
+
+TICKETS_1.1.11 = OTP-8735
 
 TICKETS_1.1.10 = OTP-8714
 
-- 
cgit v1.2.3