usa	2015-01-27 16:35:20 +0900 (Tue, 27 Jan 2015)

  New Revision: 49422

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

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

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/resolv.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 49421)
+++ ruby_2_0_0/ChangeLog	(revision 49422)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue Jan 27 16:27:44 2015  Eric Wong  <e@8...>
+
+	* lib/resolv.rb: consider ENETUNREACH as ResolvTimeout
+	  [ruby-core:67411] [Bug #10712]
+
 Thu Jan 22 18:15:41 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* ext/zlib/zlib.c: fix document of method signatures.
Index: ruby_2_0_0/lib/resolv.rb
===================================================================
--- ruby_2_0_0/lib/resolv.rb	(revision 49421)
+++ ruby_2_0_0/lib/resolv.rb	(revision 49422)
@@ -662,7 +662,12 @@ class Resolv https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/resolv.rb#L662
       def request(sender, tout)
         start = Time.now
         timelimit = start + tout
-        sender.send
+        begin
+          sender.send
+        rescue Errno::EHOSTUNREACH, # multi-homed IPv6 may generate this
+               Erron::ENETUNREACH
+          raise ResolvTimeout
+        end
         while true
           before_select = Time.now
           timeout = timelimit - before_select
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 49421)
+++ ruby_2_0_0/version.h	(revision 49422)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2015-01-22"
-#define RUBY_PATCHLEVEL 617
+#define RUBY_RELEASE_DATE "2015-01-27"
+#define RUBY_PATCHLEVEL 618
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 27
 
 #include "ruby/version.h"
 

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


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