ruby-changes:18531
From: yugui <ko1@a...>
Date: Sun, 16 Jan 2011 15:30:21 +0900 (JST)
Subject: [ruby-changes:18531] Ruby:r30554 (ruby_1_9_2): merges r30330 from trunk into ruby_1_9_2.
yugui 2011-01-16 15:30:11 +0900 (Sun, 16 Jan 2011) New Revision: 30554 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30554 Log: merges r30330 from trunk into ruby_1_9_2. -- update doc. Modified files: branches/ruby_1_9_2/ext/socket/ancdata.c branches/ruby_1_9_2/version.h Index: ruby_1_9_2/ext/socket/ancdata.c =================================================================== --- ruby_1_9_2/ext/socket/ancdata.c (revision 30553) +++ ruby_1_9_2/ext/socket/ancdata.c (revision 30554) @@ -237,15 +237,16 @@ * # recvmsg needs :scm_rights=>true for unix_rights * s1, s2 = UNIXSocket.pair * p s1 #=> #<UNIXSocket:fd 3> - * s1.sendmsg "stdin and a socket", 0, nil, [:SOCKET, :RIGHTS, [0,s1.fileno].pack("ii")] + * s1.sendmsg "stdin and a socket", 0, nil, Socket::AncillaryData.unix_rights(STDIN, s1) * _, _, _, ctl = s2.recvmsg(:scm_rights=>true) + * p ctl #=> #<Socket::AncillaryData: UNIX SOCKET RIGHTS 6 7> * p ctl.unix_rights #=> [#<IO:fd 6>, #<Socket:fd 7>] * p File.identical?(STDIN, ctl.unix_rights[0]) #=> true * p File.identical?(s1, ctl.unix_rights[1]) #=> true * * # If :scm_rights=>true is not given, unix_rights returns nil * s1, s2 = UNIXSocket.pair - * s1.sendmsg "stdin and a socket", 0, nil, [:SOCKET, :RIGHTS, [0,s1.fileno].pack("ii")] + * s1.sendmsg "stdin and a socket", 0, nil, Socket::AncillaryData.unix_rights(STDIN, s1) * _, _, _, ctl = s2.recvmsg * p ctl #=> #<Socket::AncillaryData: UNIX SOCKET RIGHTS 6 7> * p ctl.unix_rights #=> nil Index: ruby_1_9_2/version.h =================================================================== --- ruby_1_9_2/version.h (revision 30553) +++ ruby_1_9_2/version.h (revision 30554) @@ -1,13 +1,13 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 136 +#define RUBY_PATCHLEVEL 137 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -#define RUBY_RELEASE_YEAR 2010 -#define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 25 -#define RUBY_RELEASE_DATE "2010-12-25" +#define RUBY_RELEASE_YEAR 2011 +#define RUBY_RELEASE_MONTH 1 +#define RUBY_RELEASE_DAY 16 +#define RUBY_RELEASE_DATE "2011-01-16" #include "ruby/version.h" -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/