Handling poptential exceptions in on_eof, and deadlock in tests

1 files changed, 14 insertions, 2 deletions

diff --git a/lib/net/ssh/service/forward.rb b/lib/net/ssh/service/forward.rb
index 67b12ba..9e37dce 100644
--- a/lib/net/ssh/service/forward.rb
+++ b/lib/net/ssh/service/forward.rb
@@ -246,8 +246,20 @@ module Net; module SSH; module Service
         
         channel.on_eof do |ch|
           debug { "eof #{type} on #{type} forwarded channel" }
-          ch[:socket].send_pending
-          ch[:socket].shutdown Socket::SHUT_WR
+          begin
+            ch[:socket].send_pending
+            ch[:socket].shutdown Socket::SHUT_WR
+          rescue IOError => e
+            if e.message =~ /closed/ then
+              debug { "epipe in on_eof => shallowing exception:#{e}" }
+            else
+              raise
+            end
+          rescue Errno::EPIPE => e
+            debug { "epipe in on_eof => shallowing exception:#{e}" }
+          rescue Errno::ENOTCONN => e
+            debug { "enotconn in on_eof => shallowing exception:#{e}" }
+          end
         end
         
         channel.on_close do |ch|