diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-31 22:32:49 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-31 22:32:49 +0000 |
| commit | 7ae60a6b0d529ba04b8b59d3e5a58320a54b5878 (patch) | |
| tree | 8c7cfbe03fbcb3b3b5d93fb53d997f9d40497fce | |
| parent | ee5ae134dd1c0037a36b2e0c78cd4e326d002c3a (diff) | |
| download | ruby-7ae60a6b0d529ba04b8b59d3e5a58320a54b5878.tar.gz | |
* ext/socket/ancdata.c (nogvl_recvmsg_func): use MSG_CMSG_CLOEXEC if
available.
* ext/socket/unixsocket.c (recvmsg_blocking): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33594 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/socket/ancdata.c | 7 | ||||
| -rw-r--r-- | ext/socket/unixsocket.c | 7 |
3 files changed, 19 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Tue Nov 1 07:31:55 2011 Tanaka Akira <akr@fsij.org> + + * ext/socket/ancdata.c (nogvl_recvmsg_func): use MSG_CMSG_CLOEXEC if + available. + + * ext/socket/unixsocket.c (recvmsg_blocking): ditto. + Tue Nov 1 05:59:41 2011 Tanaka Akira <akr@fsij.org> * ext/socket/socket.c (rsock_socketpair): use SOCK_CLOEXEC if diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 6d824ffc99..9bb2d31801 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -1362,7 +1362,12 @@ static VALUE nogvl_recvmsg_func(void *ptr) { struct recvmsg_args_struct *args = ptr; - return recvmsg(args->fd, args->msg, args->flags); + int flags = args->flags; +#ifdef MSG_CMSG_CLOEXEC + /* MSG_CMSG_CLOEXEC is available since Linux 2.6.23. Linux 2.6.18 silently ignore it. */ + flags |= MSG_CMSG_CLOEXEC; +#endif + return recvmsg(args->fd, args->msg, flags); } static ssize_t diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c index cd4dd7b05f..e5ef44c93e 100644 --- a/ext/socket/unixsocket.c +++ b/ext/socket/unixsocket.c @@ -264,7 +264,12 @@ static VALUE recvmsg_blocking(void *data) { struct iomsg_arg *arg = data; - return recvmsg(arg->fd, &arg->msg, 0); + int flags = 0; +#ifdef MSG_CMSG_CLOEXEC + /* MSG_CMSG_CLOEXEC is available since Linux 2.6.23. Linux 2.6.18 silently ignore it. */ + flags |= MSG_CMSG_CLOEXEC; +#endif + return recvmsg(arg->fd, &arg->msg, flags); } /* |