summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-07 16:48:49 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-07 16:48:49 +0000
commit52e1c3b0ab41041f7f51a7afc3fce3aab97bc010 (patch)
treeb4e732fd7c4ba8a930aa5562da60d112bef714ce
parentf9806460e92d11824478eb8125f450b811dc3786 (diff)
* lib/net/http.rb (Net::HTTP#initialize):
default value of Net::HTTP#open_timeout is now 60 (was nil). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52480 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--NEWS3
-rw-r--r--lib/net/http.rb2
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4693463..ba6ab17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov 8 01:31:27 2015 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/net/http.rb (Net::HTTP#initialize):
+ default value of Net::HTTP#open_timeout is now 60 (was nil).
+
Sat Nov 7 12:18:05 2015 Eric Wong <e@80x24.org>
* string.c (id_to_s): remove redundant variable
diff --git a/NEWS b/NEWS
index cd3b548..2d7c8b3 100644
--- a/NEWS
+++ b/NEWS
@@ -185,6 +185,9 @@ with all sufficient information, see the ChangeLog file.
* Coverage.peek_result: new method to allow coverage to be captured without
stopping the coverage tool.
+* Net::HTTP
+ * default value of Net::HTTP#open_timeout is now 60 (was nil).
+
* Net::Telnet
* Net::Telnet is extracted to net-telnet gem. It's unmaintain code.
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 0ec9375..1021258 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -641,7 +641,7 @@ module Net #:nodoc:
@close_on_empty_response = false
@socket = nil
@started = false
- @open_timeout = nil
+ @open_timeout = 60
@read_timeout = 60
@continue_timeout = nil
@debug_output = nil