diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-16 17:04:38 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-16 17:04:38 +0000 |
| commit | cec9163e7bf3bcc77ba6a6ad612df95e1733c0d6 (patch) | |
| tree | 96a2c9cee1a0ad3738f47635e054a0287131f898 /lib | |
| parent | 2348b51bae722838b5603d0e52105419b6af2e34 (diff) | |
merge revision(s) 49175: [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_2@49286 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 3f3ed41a47..3b6e72acc2 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 |