diff options
| -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? |