naruse	2016-03-30 00:41:47 +0900 (Wed, 30 Mar 2016)

  New Revision: 54410

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

  Log:
    merge revision(s) 54073: [Backport #12166]
    
    * test/socket/test_socket.rb (test_udp_recvmsg_truncation):
      AIX does not set the MSG_TRUNC flag for a message partially read
      by recvmsg(2) with the MSG_PEEK flag set.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    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 54409)
+++ ruby_2_3/version.h	(revision 54410)
@@ -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 "2016-03-30"
-#define RUBY_PATCHLEVEL 58
+#define RUBY_PATCHLEVEL 59
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_3/test/socket/test_socket.rb
===================================================================
--- ruby_2_3/test/socket/test_socket.rb	(revision 54409)
+++ ruby_2_3/test/socket/test_socket.rb	(revision 54410)
@@ -709,7 +709,8 @@ class TestSocket < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/socket/test_socket.rb#L709
     s2.send("a" * 100, 0)
     ret, addr, rflags = s1.recvmsg(10, Socket::MSG_PEEK)
     assert_equal "a" * 10, ret
-    assert_equal Socket::MSG_TRUNC, rflags & Socket::MSG_TRUNC if !rflags.nil?
+    # AIX does not set MSG_TRUNC for a message partially read with MSG_PEEK.
+    assert_equal Socket::MSG_TRUNC, rflags & Socket::MSG_TRUNC if !rflags.nil? && /aix/ !~ RUBY_PLATFORM
     ret, addr, rflags = s1.recvmsg(10, 0)
     assert_equal "a" * 10, ret
     assert_equal Socket::MSG_TRUNC, rflags & Socket::MSG_TRUNC if !rflags.nil?
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 54409)
+++ ruby_2_3/ChangeLog	(revision 54410)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Wed Mar 30 00:41:42 2016  Rei Odaira  <Rei.Odaira@g...>
+
+	* test/socket/test_socket.rb (test_udp_recvmsg_truncation):
+	  AIX does not set the MSG_TRUNC flag for a message partially read
+	  by recvmsg(2) with the MSG_PEEK flag set.
+
 Wed Mar 30 00:00:47 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* doc/extension.rdoc, doc/extension.ja.rdoc: add editor local

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54073


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