diff options
author | glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-31 00:46:07 +0000 |
---|---|---|
committer | glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-31 00:46:07 +0000 |
commit | 69a1db96fe63ff3071cb3d272675a1d0470aab01 (patch) | |
tree | ef9aca397ca57fd1376d44309a54e69717a0c1cc | |
parent | f964fd3fa5070b95cb412cb529b47e168c0af25a (diff) | |
download | ruby-69a1db96fe63ff3071cb3d272675a1d0470aab01.tar.gz |
lib/net/http.rb: use connect_timeout instead of Timeout
lib/net/pop.rb: ditto
lib/net/ftp.rb: ditto
lib/net/smtp.rb: ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | lib/net/ftp.rb | 16 | ||||
-rw-r--r-- | lib/net/http.rb | 17 | ||||
-rw-r--r-- | lib/net/pop.rb | 6 | ||||
-rw-r--r-- | lib/net/smtp.rb | 6 |
4 files changed, 27 insertions, 18 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index e68d825dcf..ae0e8d4db1 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -329,14 +329,18 @@ module Net # SOCKS_SERVER, then a SOCKSSocket is returned, else a Socket is # returned. def open_socket(host, port) # :nodoc: - return Timeout.timeout(@open_timeout, OpenTimeout) { - if defined? SOCKSSocket and ENV["SOCKS_SERVER"] - @passive = true + if defined? SOCKSSocket and ENV["SOCKS_SERVER"] + @passive = true + return Timeout.timeout(@open_timeout, OpenTimeout) { SOCKSSocket.open(host, port) - else - Socket.tcp(host, port) + } + else + begin + return Socket.tcp(host, port, connect_timeout: @open_timeout) + rescue Errno::ETIMEDOUT + raise OpenTimeout, "execution expired" end - } + end end private :open_socket diff --git a/lib/net/http.rb b/lib/net/http.rb index 31cbb7a866..8ba15e4054 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -942,14 +942,15 @@ module Net #:nodoc: end D "opening connection to #{conn_address}:#{conn_port}..." - s = Timeout.timeout(@open_timeout, Net::OpenTimeout) { - begin - TCPSocket.open(conn_address, conn_port, @local_host, @local_port) - rescue => e - raise e, "Failed to open TCP connection to " + - "#{conn_address}:#{conn_port} (#{e.message})" - end - } + begin + s = Socket.tcp(conn_address, conn_port, @local_host, @local_port, connect_timeout: @open_timeout) + rescue Errno::ETIMEDOUT => e + raise Net::OpenTimeout, "Failed to open TCP connection to " + + "#{conn_address}:#{conn_port} (#{e.message})" + rescue => e + raise e, "Failed to open TCP connection to " + + "#{conn_address}:#{conn_port} (#{e.message})" + end s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1) D "opened" if use_ssl? diff --git a/lib/net/pop.rb b/lib/net/pop.rb index a6374cd78c..f3009f9926 100644 --- a/lib/net/pop.rb +++ b/lib/net/pop.rb @@ -541,8 +541,10 @@ module Net # internal method for Net::POP3.start def do_start(account, password) # :nodoc: - s = Timeout.timeout(@open_timeout, Net::OpenTimeout) do - TCPSocket.open(@address, port) + begin + s = Socket.tcp(@address, port, connect_timeout: @open_timeout) + rescue Errno::ETIMEDOUT + raise Net::OpenTimeout, "execution expired" end if use_ssl? raise 'openssl library not installed' unless defined?(OpenSSL) diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb index 86b55d278b..ff205b4e28 100644 --- a/lib/net/smtp.rb +++ b/lib/net/smtp.rb @@ -545,8 +545,10 @@ module Net check_auth_method(authtype || DEFAULT_AUTH_TYPE) check_auth_args user, secret end - s = Timeout.timeout(@open_timeout, Net::OpenTimeout) do - tcp_socket(@address, @port) + begin + s = Socket.tcp(@address, @port, connect_timeout: @open_timeout) + rescue Errno::ETIMEDOUT + raise Net::OpenTimeout, "execution expired" end logging "Connection opened: #{@address}:#{@port}" @socket = new_internet_message_io(tls? ? tlsconnect(s) : s) |