OTP-9386 - Calling ssh_sftp:stop_channel/1 resulted in that the trap_exit flag was set to true for the invoking process.

4 files changed, 28 insertions, 8 deletions

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 71f3941577..6fc4fdc43d 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -29,6 +29,20 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 2.0.8</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+            Calling ssh_sftp:stop_channel/1 resulted in that the trap_exit flag was
+            set to true for the invoking process.</p>
+          <p>
+            Own Id: OTP-9386 Aux Id: seq11865</p>
+        </item>
+      </list>
+    </section>
+</section>
+
 <section><title>Ssh 2.0.7</title>
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 974145836c..150b7d86dd 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,13 +19,19 @@
 
 {"%VSN%",	
  [
-  {"2.0.6", [{load_module, ssh_userreg, soft_purge, soft_purge, []}]},
+  {"2.0.7", [{load_module, ssh_sftp, soft_purge, soft_purge, []}]},
+  {"2.0.6", [{load_module, ssh_userreg, soft_purge, soft_purge, []},
+             {load_module, ssh_sftp, soft_purge, soft_purge, []}]},
   {"2.0.5", [{load_module, ssh_userreg, soft_purge, soft_purge, []},
+             {load_module, ssh_sftp, soft_purge, soft_purge, []},
              {load_module, ssh_connection_handler, soft_purge, soft_purge, [ssh_userreg]}]}
  ],
  [
-  {"2.0.6", [{load_module, ssh_userreg, soft_purge, soft_purge, []}]},
+  {"2.0.7", [{load_module, ssh_sftp, soft_purge, soft_purge, []}]},
+  {"2.0.6", [{load_module, ssh_userreg, soft_purge, soft_purge, []},
+             {load_module, ssh_sftp, soft_purge, soft_purge, []}]},
   {"2.0.5", [{load_module, ssh_userreg, soft_purge, soft_purge, []},
+             {load_module, ssh_sftp, soft_purge, soft_purge, []},
              {load_module, ssh_connection_handler, soft_purge, soft_purge, [ssh_userreg]}]}
  ]
 }.
diff --git a/lib/ssh/src/ssh_sftp.erl b/lib/ssh/src/ssh_sftp.erl
index 59e09fdd0f..d09f497588 100755
--- a/lib/ssh/src/ssh_sftp.erl
+++ b/lib/ssh/src/ssh_sftp.erl
@@ -130,9 +130,9 @@ start_channel(Host, Port, Opts) ->
     end.
 
 stop_channel(Pid) ->
-    case process_info(Pid, [trap_exit]) of
-	[{trap_exit, Bool}] ->
-	    process_flag(trap_exit, true),
+    case is_process_alive(Pid) of
+	true ->
+	    OldValue = process_flag(trap_exit, true),
 	    link(Pid),
 	    exit(Pid, ssh_sftp_stop_channel),
 	    receive 
@@ -145,9 +145,9 @@ stop_channel(Pid) ->
 			    ok
 		    end
 	    end,
-	    process_flag(trap_exit, Bool),
+	    process_flag(trap_exit, OldValue),
 	    ok;
-	undefined ->
+	false ->
 	    ok
     end.
 
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index d79038df29..fe2b915d17 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 2.0.7
+SSH_VSN = 2.0.8
 APP_VSN    = "ssh-$(SSH_VSN)"