diff --git a/ChangeLog b/ChangeLog index fa271710d2..acf9a160ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Dec 21 10:21:22 2015 Ilya Vassilevsky + + * lib/net/http.rb (open_timeout): update default value in RDoc + [ruby-core:72413] + Mon Dec 21 10:18:46 2015 Kazuki Yamaguchi * vm_backtrace.c (rb_profile_frames): ignore ifunc frames as it diff --git a/lib/net/http.rb b/lib/net/http.rb index eb08edf0f7..8149215a1c 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -702,7 +702,7 @@ module Net #:nodoc: # Number of seconds to wait for the connection to open. Any number # may be used, including Floats for fractional seconds. If the HTTP # object cannot open a connection in this many seconds, it raises a - # Net::OpenTimeout exception. The default value is +nil+. + # Net::OpenTimeout exception. The default value is 60 seconds. attr_accessor :open_timeout # Number of seconds to wait for one block to be read (via one read(2)