diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/socket/test_socket.rb | 3 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Wed Mar 30 00:41:42 2016 Rei Odaira <Rei.Odaira@gmail.com> + + * 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@ruby-lang.org> * doc/extension.rdoc, doc/extension.ja.rdoc: add editor local diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb index a34d0e8b2a..7e75837e8f 100644 --- a/test/socket/test_socket.rb +++ b/test/socket/test_socket.rb @@ -709,7 +709,8 @@ class TestSocket < Test::Unit::TestCase 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? @@ -1,6 +1,6 @@ #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 |