diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-21 16:53:30 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-21 16:53:30 +0000 |
| commit | d7d5fe8359348d08a301c67fc9b2a37dd105832b (patch) | |
| tree | a4c45cbb37334e7eec97170f5cff5707f38eab99 | |
| parent | 809664ee8ee68437c74982416b2e3b7b62ac6141 (diff) | |
| download | ruby-d7d5fe8359348d08a301c67fc9b2a37dd105832b.tar.gz ruby-d7d5fe8359348d08a301c67fc9b2a37dd105832b.tar.xz ruby-d7d5fe8359348d08a301c67fc9b2a37dd105832b.zip | |
* ext/socket/ancdata.c (bsock_recvmsg_internal): don't call
discard_cmsg_resource when EMFILE.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22488 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/socket/ancdata.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Feb 22 01:52:30 2009 Tanaka Akira <akr@fsij.org> + + * ext/socket/ancdata.c (bsock_recvmsg_internal): don't call + discard_cmsg_resource when EMFILE. + Sun Feb 22 01:48:51 2009 Tanaka Akira <akr@fsij.org> * ext/socket/ancdata.c (bsock_recvmsg_internal): gc when SCM_RIGHTS diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 5afd3d66e..28f00649d 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; |