archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-27 06:56:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

* ext/socket/extconf.rb: test recvmsg allocates file descriptors for

Browse source 
fd passing even with MSG_PEEK.

* ext/socket/ancdata.c: use the above test result.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2011-07-23 23:57:50 +00:00
parent ab1102717b
commit b6fd481c21
3 changed files with 101 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ext/socket/ancdata.c
View file

@ -1379,12 +1379,14 @@ rb_recvmsg(int fd, struct msghdr *msg, int flags)
static void
discard_cmsg(struct cmsghdr *cmh, char *msg_end, int msg_peek_p)
{
# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
# if !defined(FD_PASSING_WORK_WITH_RECVMSG_MSG_PEEK)
/*
* nagachika finds recvmsg with MSG_PEEK doesn't return fds on MacOS X Snow Leopard. [ruby-dev:44209]
* naruse finds FreeBSD behaves as so too and comment in kernel of FreeBSD 8.2.0. [ruby-dev:44189]
* kosaki finds same comment in MacOS X Snow Leopard. [ruby-dev:44192]
* Takahiro Kambe finds same comment since NetBSD 5. [ruby-dev:44205]
* FreeBSD 8.2.0, NetBSD 5 and MacOS X Snow Leopard doesn't
* allocate fds by recvmsg with MSG_PEEK.
* [ruby-dev:44189]
* http://redmine.ruby-lang.org/issues/5075
*
* Linux 2.6.38 allocate fds by recvmsg with MSG_PEEK.
*/
if (msg_peek_p)
return;