1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "lib/net/http.rb: use connect_timeout instead of Timeout"

Browse Source 
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
This commit is contained in:
glass 2018-12-31 01:09:30 +00:00
parent 69a1db96fe
commit c5e8627f65
4 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/net/ftp.rb
View File

@ -329,18 +329,14 @@ module Net
# SOCKS_SERVER, then a SOCKSSocket is returned, else a Socket is # SOCKS_SERVER, then a SOCKSSocket is returned, else a Socket is
# returned. # returned.
def open_socket(host, port) # :nodoc: def open_socket(host, port) # :nodoc:
if defined? SOCKSSocket and ENV["SOCKS_SERVER"] return Timeout.timeout(@open_timeout, OpenTimeout) {
@passive = true if defined? SOCKSSocket and ENV["SOCKS_SERVER"]
return Timeout.timeout(@open_timeout, OpenTimeout) { @passive = true
SOCKSSocket.open(host, port) SOCKSSocket.open(host, port)
} else
else Socket.tcp(host, port)
begin
return Socket.tcp(host, port, connect_timeout: @open_timeout)
rescue Errno::ETIMEDOUT
raise OpenTimeout, "execution expired"
end end
end }
end end
private :open_socket private :open_socket

17
lib/net/http.rb
View File

@ -942,15 +942,14 @@ module Net #:nodoc:
end end
D "opening connection to #{conn_address}:#{conn_port}..." D "opening connection to #{conn_address}:#{conn_port}..."
begin s = Timeout.timeout(@open_timeout, Net::OpenTimeout) {
s = Socket.tcp(conn_address, conn_port, @local_host, @local_port, connect_timeout: @open_timeout) begin
rescue Errno::ETIMEDOUT => e TCPSocket.open(conn_address, conn_port, @local_host, @local_port)
raise Net::OpenTimeout, "Failed to open TCP connection to " + rescue => e
"#{conn_address}:#{conn_port} (#{e.message})" raise e, "Failed to open TCP connection to " +
rescue => e "#{conn_address}:#{conn_port} (#{e.message})"
raise e, "Failed to open TCP connection to " + end
"#{conn_address}:#{conn_port} (#{e.message})" }
end
s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1) s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
D "opened" D "opened"
if use_ssl? if use_ssl?

6
lib/net/pop.rb
View File

@ -541,10 +541,8 @@ module Net
# internal method for Net::POP3.start # internal method for Net::POP3.start
def do_start(account, password) # :nodoc: def do_start(account, password) # :nodoc:
begin s = Timeout.timeout(@open_timeout, Net::OpenTimeout) do
s = Socket.tcp(@address, port, connect_timeout: @open_timeout) TCPSocket.open(@address, port)
rescue Errno::ETIMEDOUT
raise Net::OpenTimeout, "execution expired"
end end
if use_ssl? if use_ssl?
raise 'openssl library not installed' unless defined?(OpenSSL) raise 'openssl library not installed' unless defined?(OpenSSL)

6
lib/net/smtp.rb
View File

@ -545,10 +545,8 @@ module Net
check_auth_method(authtype || DEFAULT_AUTH_TYPE) check_auth_method(authtype || DEFAULT_AUTH_TYPE)
check_auth_args user, secret check_auth_args user, secret
end end
begin s = Timeout.timeout(@open_timeout, Net::OpenTimeout) do
s = Socket.tcp(@address, @port, connect_timeout: @open_timeout) tcp_socket(@address, @port)
rescue Errno::ETIMEDOUT
raise Net::OpenTimeout, "execution expired"
end end
logging "Connection opened: #{@address}:#{@port}" logging "Connection opened: #{@address}:#{@port}"
@socket = new_internet_message_io(tls? ? tlsconnect(s) : s) @socket = new_internet_message_io(tls? ? tlsconnect(s) : s)