archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 00:54:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 49175: [Backport #10712]

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Jan 17 02:04:01 2015 Eric Wong <e@80x24.org>
* lib/resolv.rb: consider ENETUNREACH as ResolvTimeout
[ruby-core:67411] [Bug #10712]
Sat Jan 17 01:57:57 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> Sat Jan 17 01:57:57 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* ext/zlib/zlib.c: fix document of method signatures. * ext/zlib/zlib.c: fix document of method signatures.

4
lib/resolv.rb
View file

@ -670,8 +670,8 @@ class Resolv
timelimit = start + tout timelimit = start + tout
begin begin
sender.send sender.send
rescue Errno::EHOSTUNREACH rescue Errno::EHOSTUNREACH, # multi-homed IPv6 may generate this
# multi-homed IPv6 may generate this Errno::ENETUNREACH
raise ResolvTimeout raise ResolvTimeout
end end
while true while true

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.0" #define RUBY_VERSION "2.2.0"
#define RUBY_RELEASE_DATE "2015-01-17" #define RUBY_RELEASE_DATE "2015-01-17"
#define RUBY_PATCHLEVEL 17 #define RUBY_PATCHLEVEL 18
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 1