summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/socket/test_socket.rb7
-rw-r--r--version.h2
2 files changed, 6 insertions, 3 deletions
diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb
index 3fdb2fa7be..a34d0e8b2a 100644
--- a/test/socket/test_socket.rb
+++ b/test/socket/test_socket.rb
@@ -240,9 +240,12 @@ class TestSocket < Test::Unit::TestCase
unix_server = Socket.unix_server_socket("#{tmpdir}/sock")
tcp_servers.each {|s|
addr = s.connect_address
- assert_nothing_raised("connect to #{addr.inspect}") {
+ begin
clients << addr.connect
- }
+ rescue
+ # allow failure if the address is IPv6
+ raise unless addr.ipv6?
+ end
}
addr = unix_server.connect_address
assert_nothing_raised("connect to #{addr.inspect}") {
diff --git a/version.h b/version.h
index 03a90cc5d6..4501d3c52f 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.0"
#define RUBY_RELEASE_DATE "2015-12-25"
-#define RUBY_PATCHLEVEL 0
+#define RUBY_PATCHLEVEL 1
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 12