1 files changed, 6 insertions, 10 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index ae0e8d4db1..e68d825dcf 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -329,18 +329,14 @@ module Net
     # SOCKS_SERVER, then a SOCKSSocket is returned, else a Socket is
     # returned.
     def open_socket(host, port) # :nodoc:
-      if defined? SOCKSSocket and ENV["SOCKS_SERVER"]
-        @passive = true
-        return Timeout.timeout(@open_timeout, OpenTimeout) {
+      return Timeout.timeout(@open_timeout, OpenTimeout) {
+        if defined? SOCKSSocket and ENV["SOCKS_SERVER"]
+          @passive = true
           SOCKSSocket.open(host, port)
-        }
-      else
-        begin
-          return Socket.tcp(host, port, connect_timeout: @open_timeout)
-        rescue Errno::ETIMEDOUT
-          raise OpenTimeout, "execution expired"
+        else
+          Socket.tcp(host, port)
         end
-      end
+      }
     end
     private :open_socket