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
This commit is contained in:
naruse 2015-01-16 17:04:38 +00:00
parent 2348b51bae
commit cec9163e7b
3 changed files with 8 additions and 3 deletions

View file

@ -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