summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-23 22:57:29 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-23 22:57:29 +0000
commitd51743afc80c377d89260a57121c6911564df1b0 (patch)
tree29b24584d293b386be21d12f286cd555caac9c5f
parent61e5fe06748de67e1d198a4d28d1e59e5c1dcedc (diff)
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
-rw-r--r--ChangeLog4
-rw-r--r--ext/socket/init.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d378580..500cfb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov 24 07:56:54 2015 Eric Wong <e@80x24.org>
+
+ * ext/socket/init.c (rsock_accept): handle ENOMEM
+
Tue Nov 24 07:50:15 2015 Eric Wong <e@80x24.org>
* dir.c (dir_initialize): use rb_gc_for_fd for ENOMEM
diff --git a/ext/socket/init.c b/ext/socket/init.c
index 3fb4366..d071102 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;