diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-27 14:23:54 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-27 14:23:54 +0000 |
| commit | d8c66c433393cb0ff97fcbd32f6a4fdc4d8f8b79 (patch) | |
| tree | 2cb82727ae0c478367a7dbccf23ec522587119e7 /test/socket | |
| parent | a7d581fa2f88d2f45d1f2d670cc1c8f9e755b2d1 (diff) | |
| download | ruby-d8c66c433393cb0ff97fcbd32f6a4fdc4d8f8b79.tar.gz | |
* ext/socket/ancdata.c (bsock_recvmsg_internal): close FDs passed by
SCM_RIGHTS unless :scm_rights=>true is given.
(discard_cmsg): extracted from rsock_discard_cmsg_resource.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22667 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/socket')
| -rw-r--r-- | test/socket/test_unix.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/socket/test_unix.rb b/test/socket/test_unix.rb index 1e9073dd0a..e75d7b6f9a 100644 --- a/test/socket/test_unix.rb +++ b/test/socket/test_unix.rb @@ -48,7 +48,7 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase return end assert_equal(1, ret) - ret = s2.recvmsg + ret = s2.recvmsg(:scm_rights=>true) data, srcaddr, flags, *ctls = ret recv_io_ary = [] ctls.each {|ctl| @@ -83,7 +83,7 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase return end assert_equal(1, ret) - ret = s2.recvmsg + ret = s2.recvmsg(:scm_rights=>true) data, srcaddr, flags, *ctls = ret recv_io_ary = [] ctls.each {|ctl| @@ -170,7 +170,7 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase IO.pipe {|r1, w| UNIXSocket.pair {|s1, s2| s1.send_io(r1) - ret = s2.recvmsg + ret = s2.recvmsg(:scm_rights=>true) data, srcaddr, flags, *ctls = ret assert_equal("\0", data) if flags == nil |