nagachika	2013-04-15 00:19:46 +0900 (Mon, 15 Apr 2013)

  New Revision: 40295

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40295

  Log:
    merge revision(s) 40014: [Backport #8199]
    
    Document the default Net timeout values by @toolmantim [GH fixes #269]
    
     * lib/net/{ftp,http,pop,smtp}.rb: added documentation for default values.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/lib/net/ftp.rb
    branches/ruby_2_0_0/lib/net/http.rb
    branches/ruby_2_0_0/lib/net/pop.rb
    branches/ruby_2_0_0/lib/net/smtp.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/lib/net/pop.rb
===================================================================
--- ruby_2_0_0/lib/net/pop.rb	(revision 40294)
+++ ruby_2_0_0/lib/net/pop.rb	(revision 40295)
@@ -496,12 +496,12 @@ module Net https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/net/pop.rb#L496
 
     # Seconds to wait until a connection is opened.
     # If the POP3 object cannot open a connection within this time,
-    # it raises a Net::OpenTimeout exception.
+    # it raises a Net::OpenTimeout exception. The default value is 30 seconds.
     attr_accessor :open_timeout
 
     # Seconds to wait until reading one block (by one read(1) call).
     # If the POP3 object cannot complete a read() within this time,
-    # it raises a Net::ReadTimeout exception.
+    # it raises a Net::ReadTimeout exception. The default value is 60 seconds.
     attr_reader :read_timeout
 
     # Set the read timeout.
Index: ruby_2_0_0/lib/net/http.rb
===================================================================
--- ruby_2_0_0/lib/net/http.rb	(revision 40294)
+++ ruby_2_0_0/lib/net/http.rb	(revision 40295)
@@ -701,13 +701,13 @@ module Net   #:nodoc: https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/net/http.rb#L701
     # 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.
+    # Net::OpenTimeout exception. The default value is +nil+.
     attr_accessor :open_timeout
 
     # Number of seconds to wait for one block to be read (via one read(2)
     # call). Any number may be used, including Floats for fractional
     # seconds. If the HTTP object cannot read data in this many seconds,
-    # it raises a Net::ReadTimeout exception.
+    # it raises a Net::ReadTimeout exception. The default value is 60 seconds.
     attr_reader :read_timeout
 
     # Setter for the read_timeout attribute.
@@ -716,8 +716,9 @@ module Net   #:nodoc: https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/net/http.rb#L716
       @read_timeout = sec
     end
 
-    # Seconds to wait for 100 Continue response.  If the HTTP object does not
-    # receive a response in this many seconds it sends the request body.
+    # Seconds to wait for 100 Continue response. If the HTTP object does not
+    # receive a response in this many seconds it sends the request body. The
+    # default value is +nil+.
     attr_reader :continue_timeout
 
     # Setter for the continue_timeout attribute.
Index: ruby_2_0_0/lib/net/smtp.rb
===================================================================
--- ruby_2_0_0/lib/net/smtp.rb	(revision 40294)
+++ ruby_2_0_0/lib/net/smtp.rb	(revision 40295)
@@ -362,12 +362,12 @@ module Net https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/net/smtp.rb#L362
 
     # Seconds to wait while attempting to open a connection.
     # If the connection cannot be opened within this time, a
-    # Net::OpenTimeout is raised.
+    # Net::OpenTimeout is raised. The default value is 30 seconds.
     attr_accessor :open_timeout
 
     # Seconds to wait while reading one block (by one read(2) call).
     # If the read(2) call does not complete within this time, a
-    # Net::ReadTimeout is raised.
+    # Net::ReadTimeout is raised. The default value is 60 seconds.
     attr_reader :read_timeout
 
     # Set the number of seconds to wait until timing-out a read(2)
Index: ruby_2_0_0/lib/net/ftp.rb
===================================================================
--- ruby_2_0_0/lib/net/ftp.rb	(revision 40294)
+++ ruby_2_0_0/lib/net/ftp.rb	(revision 40295)
@@ -97,13 +97,13 @@ module Net https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/net/ftp.rb#L97
     # Number of seconds to wait for the connection to open. Any number
     # may be used, including Floats for fractional seconds. If the FTP
     # object cannot open a connection in this many seconds, it raises a
-    # Net::OpenTimeout exception.
+    # Net::OpenTimeout exception. The default value is +nil+.
     attr_accessor :open_timeout
 
     # Number of seconds to wait for one block to be read (via one read(2)
     # call). Any number may be used, including Floats for fractional
     # seconds. If the FTP object cannot read data in this many seconds,
-    # it raises a TimeoutError exception.
+    # it raises a TimeoutError exception. The default value is 60 seconds.
     attr_reader :read_timeout
 
     # Setter for the read_timeout attribute.
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40294)
+++ ruby_2_0_0/version.h	(revision 40295)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-04-15"
-#define RUBY_PATCHLEVEL 130
+#define RUBY_PATCHLEVEL 131
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40014


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/