From 7ae60a6b0d529ba04b8b59d3e5a58320a54b5878 Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 31 Oct 2011 22:32:49 +0000 Subject: * 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 --- ext/socket/ancdata.c | 7 ++++++- ext/socket/unixsocket.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'ext/socket') 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); } /* -- cgit v1.2.3