From d51743afc80c377d89260a57121c6911564df1b0 Mon Sep 17 00:00:00 2001 From: normal Date: Mon, 23 Nov 2015 22:57:29 +0000 Subject: ext/socket/init.c (rsock_accept): handle ENOMEM accept(2) documents ENOMEM as a possible error, handle it consistent with all of our other FD-allocating wrappers. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/socket/init.c | 1 + 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index d3785801c6..500cfb3759 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Nov 24 07:56:54 2015 Eric Wong + + * ext/socket/init.c (rsock_accept): handle ENOMEM + Tue Nov 24 07:50:15 2015 Eric Wong * dir.c (dir_initialize): use rb_gc_for_fd for ENOMEM diff --git a/ext/socket/init.c b/ext/socket/init.c index 3fb436614e..d0711025a5 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -605,6 +605,7 @@ rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len) switch (errno) { case EMFILE: case ENFILE: + case ENOMEM: if (retry) break; rb_gc(); retry = 1; -- cgit v1.2.3