diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-28 16:15:49 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-28 16:15:49 +0000 |
| commit | 8e73157dd03c5dd4848da16edbb59c44b07b2d4c (patch) | |
| tree | e626741b0c4bda3fc41af7de932e6a3e012e0d2a /lib | |
| parent | 4ad3a5c32c25ff5ea58d45f44be6f76aca81cb87 (diff) | |
merge revision(s) r49175: [Backport #10712]
* lib/resolv.rb: consider ENETUNREACH as ResolvTimeout
[ruby-core:67411] [Bug #10712]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49785 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/resolv.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/resolv.rb b/lib/resolv.rb index 55aa9638ba..74618bfaab 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -671,8 +671,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 |