archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 01:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 54073: [Backport #12166]

Browse source 
* 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2016-03-29 15:41:47 +00:00
parent 0d41668f6c
commit b39a6bef9c
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> Wed Mar 30 00:00:47 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* doc/extension.rdoc, doc/extension.ja.rdoc: add editor local * doc/extension.rdoc, doc/extension.ja.rdoc: add editor local

3
test/socket/test_socket.rb
View file

@ -709,7 +709,8 @@ class TestSocket < Test::Unit::TestCase
s2.send("a" * 100, 0) s2.send("a" * 100, 0)
ret, addr, rflags = s1.recvmsg(10, Socket::MSG_PEEK) ret, addr, rflags = s1.recvmsg(10, Socket::MSG_PEEK)
assert_equal "a" * 10, ret 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) ret, addr, rflags = s1.recvmsg(10, 0)
assert_equal "a" * 10, ret assert_equal "a" * 10, ret
assert_equal Socket::MSG_TRUNC, rflags & Socket::MSG_TRUNC if !rflags.nil? assert_equal Socket::MSG_TRUNC, rflags & Socket::MSG_TRUNC if !rflags.nil?

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.0" #define RUBY_VERSION "2.3.0"
#define RUBY_RELEASE_DATE "2016-03-30" #define RUBY_RELEASE_DATE "2016-03-30"
#define RUBY_PATCHLEVEL 58 #define RUBY_PATCHLEVEL 59
#define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3