From 60f2cec6468bd4ce1d9821d851c9758b4299635c Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 21 Feb 2009 16:53:30 +0000 Subject: [PATCH] * ext/socket/ancdata.c (bsock_recvmsg_internal): don't call discard_cmsg_resource when EMFILE. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22488 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/socket/ancdata.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 481394ee82..259c604274 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Feb 22 01:52:30 2009 Tanaka Akira + + * ext/socket/ancdata.c (bsock_recvmsg_internal): don't call + discard_cmsg_resource when EMFILE. + Sun Feb 22 01:48:51 2009 Tanaka Akira * ext/socket/ancdata.c (bsock_recvmsg_internal): gc when SCM_RIGHTS diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 5afd3d66e2..28f00649d7 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -1301,7 +1301,6 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) if (errno == EMFILE && !gc_done) { /* SCM_RIGHTS hit the file descriptors limit, maybe. */ gc_and_retry: - discard_cmsg_resource(&mh); rb_gc(); gc_done = 1; goto retry; @@ -1323,8 +1322,10 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) mh.msg_controllen < maxctllen - BIG_ENOUGH_SPACE) { /* there are big space bug truncated. * file descriptors limit? */ - if (!gc_done) + if (!gc_done) { + discard_cmsg_resource(&mh); goto gc_and_retry; + } } else { maxctllen *= 2;