diff options
Diffstat (limited to 'lib/net/http.rb')
-rw-r--r-- | lib/net/http.rb | 17 |
1 files changed, 9 insertions, 8 deletions
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? |