From 9860cf1ac35d9e6be2f64fcdfc71350f860af42a Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 24 Dec 2015 18:11:07 +0000
Subject: [PATCH] merge revision(s) 53294:

	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
---
 test/socket/test_socket.rb | 7 +++++--
 version.h                  | 2 +-
 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