nagachika	2015-03-01 01:15:49 +0900 (Sun, 01 Mar 2015)

  New Revision: 49785

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

  Log:
    merge revision(s) r49175: [Backport #10712]
    
    * lib/resolv.rb: consider ENETUNREACH as ResolvTimeout
      [ruby-core:67411] [Bug #10712]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/resolv.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 49784)
+++ ruby_2_1/ChangeLog	(revision 49785)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sun Mar  1 01:14:59 2015  Eric Wong  <e@8...>
+
+	* lib/resolv.rb: consider ENETUNREACH as ResolvTimeout
+	  [ruby-core:67411] [Bug #10712]
+
 Sun Mar  1 01:01:21 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* lib/net/http.rb (Net::HTTP#send_request): there is no response body
Index: ruby_2_1/lib/resolv.rb
===================================================================
--- ruby_2_1/lib/resolv.rb	(revision 49784)
+++ ruby_2_1/lib/resolv.rb	(revision 49785)
@@ -671,8 +671,8 @@ class Resolv https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/resolv.rb#L671
         timelimit = start + tout
         begin
           sender.send
-        rescue Errno::EHOSTUNREACH
-          # multi-homed IPv6 may generate this
+        rescue Errno::EHOSTUNREACH, # multi-homed IPv6 may generate this
+               Errno::ENETUNREACH
           raise ResolvTimeout
         end
         while true
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49784)
+++ ruby_2_1/version.h	(revision 49785)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
 #define RUBY_RELEASE_DATE "2015-03-01"
-#define RUBY_PATCHLEVEL 302
+#define RUBY_PATCHLEVEL 303
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49175


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