archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 53294:

Browse source 
ignore exception is the address is IPv6

	some environments disables IPv6 even if they have IPv6 addresses.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@53296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2015-12-24 18:11:07 +00:00
parent 73f7ac1f66
commit 9860cf1ac3
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
test/socket/test_socket.rb
View file

@ -240,9 +240,12 @@ class TestSocket < Test::Unit::TestCase
unix_server = Socket.unix_server_socket("#{tmpdir}/sock") unix_server = Socket.unix_server_socket("#{tmpdir}/sock")
tcp_servers.each {|s| tcp_servers.each {|s|
addr = s.connect_address addr = s.connect_address
assert_nothing_raised("connect to #{addr.inspect}") { begin
clients << addr.connect clients << addr.connect
} rescue
# allow failure if the address is IPv6
raise unless addr.ipv6?
end
} }
addr = unix_server.connect_address addr = unix_server.connect_address
assert_nothing_raised("connect to #{addr.inspect}") { assert_nothing_raised("connect to #{addr.inspect}") {

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.0" #define RUBY_VERSION "2.3.0"
#define RUBY_RELEASE_DATE "2015-12-25" #define RUBY_RELEASE_DATE "2015-12-25"
#define RUBY_PATCHLEVEL 0 #define RUBY_PATCHLEVEL 1
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 12 #define RUBY_RELEASE_MONTH 12