merge revision(s) r49175: [Backport ruby#10712]

nagachika · nagachika · commit 8e73157dd03c · 2015-02-28T16:15:49.000Z
* lib/resolv.rb: consider ENETUNREACH as ResolvTimeout [ruby-core:67411] [Bug ruby#10712] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49785 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar  1 01:14:59 2015  Eric Wong  <e@80x24.org>
+
+	* lib/resolv.rb: consider ENETUNREACH as ResolvTimeout
+	  [ruby-core:67411] [Bug #10712]
+
 Sun Mar  1 01:01:21 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
 
 	* lib/net/http.rb (Net::HTTP#send_request): there is no response body
diff --git a/lib/resolv.rb b/lib/resolv.rb
@@ -671,8 +671,8 @@ def request(sender, tout)
         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
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #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

-Original file line number
+Diff line change
@@ @@ -1,3 +1,8 @@ @@
 +Sun Mar  1 01:14:59 2015  Eric Wong  <[email protected]>
++
 +	* lib/resolv.rb: consider ENETUNREACH as ResolvTimeout
 +	  [ruby-core:67411] [Bug #10712]
++
 Sun Mar  1 01:01:21 2015  SHIBATA Hiroshi  <[email protected]>
 	* lib/net/http.rb (Net::HTTP#send_request): there is no response body