summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaisuke Aritomo <osyoyu@osyoyu.com>2025-07-22 23:34:25 +0900
committergit <svn-admin@ruby-lang.org>2025-11-10 02:40:46 +0000
commit97efbc47d080e3ade3b5db889d3740fdf0711161 (patch)
treeb6c2224a423a1ace707957cc35df631b64af2186
parentf710e6bb54a1e2cfe808222bc8d70d8f68ab5dc9 (diff)
[ruby/net-http] Ruby 2 compat
https://github.com/ruby/net-http/commit/09bf573dd5
-rw-r--r--lib/net/http.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb
index d6db9ba132..810ee008fa 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -1677,7 +1677,7 @@ module Net #:nodoc:
# Use built-in timeout in TCPSocket.open if available
TCPSocket.open(conn_addr, conn_port, @local_host, @local_port, open_timeout: @open_timeout)
rescue ArgumentError => e
- raise if !e.message.include?('unknown keyword: :open_timeout')
+ raise if !(e.message.include?('unknown keyword: :open_timeout') || e.message.include?('wrong number of arguments (given 5, expected 2..4)'))
# Fallback to Timeout.timeout if TCPSocket.open does not support open_timeout
Timeout.timeout(@open_timeout, Net::OpenTimeout) {
TCPSocket.open(conn_addr, conn_port, @local_host, @local_port)