usa	2013-05-14 10:33:34 +0900 (Tue, 14 May 2013)

  New Revision: 40712

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

  Log:
    merge revision(s) 40014: [Backport #8198]
    
    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_1_9_3/
  Modified files:
    branches/ruby_1_9_3/lib/net/http.rb
    branches/ruby_1_9_3/lib/net/pop.rb
    branches/ruby_1_9_3/lib/net/smtp.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/lib/net/pop.rb
===================================================================
--- ruby_1_9_3/lib/net/pop.rb	(revision 40711)
+++ ruby_1_9_3/lib/net/pop.rb	(revision 40712)
@@ -498,12 +498,12 @@ module Net https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/lib/net/pop.rb#L498
 
     # Seconds to wait until a connection is opened.
     # If the POP3 object cannot open a connection within this time,
-    # it raises a TimeoutError exception.
+    # it raises a TimeoutError 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 TimeoutError exception.
+    # it raises a TimeoutError exception. The default value is 60 seconds.
     attr_reader :read_timeout
 
     # Set the read timeout.
Index: ruby_1_9_3/lib/net/http.rb
===================================================================
--- ruby_1_9_3/lib/net/http.rb	(revision 40711)
+++ ruby_1_9_3/lib/net/http.rb	(revision 40712)
@@ -623,13 +623,13 @@ module Net   #:nodoc: https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/lib/net/http.rb#L623
     # 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
-    # TimeoutError exception.
+    # TimeoutError 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 TimeoutError exception.
+    # it raises a TimeoutError exception. The default value is 60 seconds.
     attr_reader :read_timeout
 
     # Setter for the read_timeout attribute.
@@ -638,8 +638,9 @@ module Net   #:nodoc: https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/lib/net/http.rb#L638
       @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_1_9_3/lib/net/smtp.rb
===================================================================
--- ruby_1_9_3/lib/net/smtp.rb	(revision 40711)
+++ ruby_1_9_3/lib/net/smtp.rb	(revision 40712)
@@ -364,12 +364,12 @@ module Net https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/lib/net/smtp.rb#L364
 
     # Seconds to wait while attempting to open a connection.
     # If the connection cannot be opened within this time, a
-    # TimeoutError is raised.
+    # TimeoutError 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
-    # TimeoutError is raised.
+    # TimeoutError 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_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 40711)
+++ ruby_1_9_3/version.h	(revision 40712)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 416
+#define RUBY_PATCHLEVEL 417
 
 #define RUBY_RELEASE_DATE "2013-05-14"
 #define RUBY_RELEASE_YEAR 2013

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


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