diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-10-21 21:33:50 +0900 |
---|---|---|
committer | git <svn-admin@ruby-lang.org> | 2022-10-21 12:39:52 +0000 |
commit | f88bff770578583a708093f4a0d8b1483a1d2039 (patch) | |
tree | e0d7e55f1f2c5a5664a1622f9bd78aa831e077eb /lib/net/http.rb | |
parent | e026368061c56bc925aff58910a4b02f18b78c70 (diff) |
[ruby/net-http] Revert "Replace Timeout.timeout in Net:HTTP#connect"
This reverts commit https://github.com/ruby/net-http/commit/753cae3bbccc.
https://github.com/ruby/net-http/commit/98caa38204
Diffstat (limited to 'lib/net/http.rb')
-rw-r--r-- | lib/net/http.rb | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb index 7e89409c1b..928541f8e8 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -1013,13 +1013,14 @@ module Net #:nodoc: end debug "opening connection to #{conn_addr}:#{conn_port}..." - begin - s = Socket.tcp conn_addr, conn_port, @local_host, @local_port, connect_timeout: @open_timeout - rescue => e - e = Net::OpenTimeout.new(e) if e.is_a?(Errno::ETIMEDOUT) #for compatibility with previous versions - raise e, "Failed to open TCP connection to " + - "#{conn_addr}:#{conn_port} (#{e.message})" - end + s = Timeout.timeout(@open_timeout, Net::OpenTimeout) { + begin + TCPSocket.open(conn_addr, conn_port, @local_host, @local_port) + rescue => e + raise e, "Failed to open TCP connection to " + + "#{conn_addr}:#{conn_port} (#{e.message})" + end + } s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1) debug "opened" if use_ssl? |