From c5e8627f658c88b2403e7b20637cf25e31feff88 Mon Sep 17 00:00:00 2001 From: glass Date: Mon, 31 Dec 2018 01:09:30 +0000 Subject: Revert "lib/net/http.rb: use connect_timeout instead of Timeout" This reverts commit 69a1db96fe63ff3071cb3d272675a1d0470aab01. getaddrinfo(3) doesn't support timeout. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/net/ftp.rb | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'lib/net/ftp.rb') 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 -- cgit v1.2.3