Don't use Timeout::timeout on connect, use Socket timeout

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/net/ssh/transport/session.rb b/lib/net/ssh/transport/session.rb
index 19e6bbd..9f3049e 100644
--- a/lib/net/ssh/transport/session.rb
+++ b/lib/net/ssh/transport/session.rb
@@ -64,13 +64,15 @@ module Net; module SSH; module Transport
 
       debug { "establishing connection to #{@host}:#{@port}" }
 
-      @socket = timeout(options[:timeout] || 0) do
+      @socket =
         if (factory = options[:proxy])
-          factory.open(@host, @port, options)
+          timeout(options[:timeout] || 0) do
+            factory.open(@host, @port, options)
+          end
         else
-          TCPSocket.open(@host, @port, @bind_address)
+          Socket.tcp(@host, @port, @bind_address, nil,
+                     connect_timeout: options[:timeout])
         end
-      end
 
       @socket.extend(PacketStream)
       @socket.logger = @logger