naruse	2015-12-25 03:11:07 +0900 (Fri, 25 Dec 2015)

  New Revision: 53296

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53296

  Log:
    merge revision(s) 53294:
    
    ignore exception is the address is IPv6
    
    some environments disables IPv6 even if they have IPv6 addresses.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/test/socket/test_socket.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 53295)
+++ ruby_2_3/version.h	(revision 53296)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #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
Index: ruby_2_3/test/socket/test_socket.rb
===================================================================
--- ruby_2_3/test/socket/test_socket.rb	(revision 53295)
+++ ruby_2_3/test/socket/test_socket.rb	(revision 53296)
@@ -240,9 +240,12 @@ class TestSocket < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/socket/test_socket.rb#L240
           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}") {

Property changes on: ruby_2_3
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk:r53294


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/