kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) r49175: [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_1@49785 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-02-28 16:15:49 +00:00
parent 4ad3a5c32c
commit 8e73157dd0
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 @@
Sun Mar 1 01:14:59 2015 Eric Wong <e@80x24.org>
* lib/resolv.rb: consider ENETUNREACH as ResolvTimeout
[ruby-core:67411] [Bug #10712]
Sun Mar 1 01:01:21 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* lib/net/http.rb (Net::HTTP#send_request): there is no response body

4
lib/resolv.rb
View file

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

2
version.h
View file

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