naruse	2015-01-17 02:04:38 +0900 (Sat, 17 Jan 2015)

  New Revision: 49286

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

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

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/lib/resolv.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49285)
+++ ruby_2_2/ChangeLog	(revision 49286)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sat Jan 17 02:04:01 2015  Eric Wong  <e@8...>
+
+	* lib/resolv.rb: consider ENETUNREACH as ResolvTimeout
+	  [ruby-core:67411] [Bug #10712]
+
 Sat Jan 17 01:57:57 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* ext/zlib/zlib.c: fix document of method signatures.
Index: ruby_2_2/lib/resolv.rb
===================================================================
--- ruby_2_2/lib/resolv.rb	(revision 49285)
+++ ruby_2_2/lib/resolv.rb	(revision 49286)
@@ -670,8 +670,8 @@ class Resolv https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/resolv.rb#L670
         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_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49285)
+++ ruby_2_2/version.h	(revision 49286)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-01-17"
-#define RUBY_PATCHLEVEL 17
+#define RUBY_PATCHLEVEL 18
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 1

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


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