diff --git a/ChangeLog b/ChangeLog index 2a9b1b7374..464021cb6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Mar 1 01:14:59 2015 Eric Wong + + * lib/resolv.rb: consider ENETUNREACH as ResolvTimeout + [ruby-core:67411] [Bug #10712] + Sun Mar 1 01:01:21 2015 SHIBATA Hiroshi * lib/net/http.rb (Net::HTTP#send_request): there is no response body 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 diff --git a/version.h b/version.h index bb795a2b68..1f3a340e36 100644 --- 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