aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/resolv.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e97322cb1..0954e6acc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 8 07:17:14 2015 Eric Wong <e@80x24.org>
+
+ * lib/resolv.rb: consider ENETUNREACH as ResolvTimeout
+ [ruby-core:67411] [Bug #10712]
+
Thu Jan 8 00:13:52 2015 Tanaka Akira <akr@fsij.org>
* lib/open3.rb: Open3 properly passes non-keyword hash args to spawn.
diff --git a/lib/resolv.rb b/lib/resolv.rb
index a801cf6ff4..6498615d79 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -670,8 +670,8 @@ class Resolv
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