summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ext/socket/init.c25
2 files changed, 26 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e2b0562..ef8825d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 31 23:31:53 2011 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/init.c (rsock_socket): use SOCK_CLOEXEC if available.
+
Mon Oct 31 21:47:44 2011 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (rb_cloexec_pipe): NetBSD 6.0 will support pipe2(2),
diff --git a/ext/socket/init.c b/ext/socket/init.c
index 70c92d7..2f6b6ee 100644
--- a/ext/socket/init.c
+++ b/ext/socket/init.c
@@ -240,19 +240,38 @@ rsock_s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type
}
int
-rsock_socket(int domain, int type, int proto)
+rsock_socket(int domain, int type0, int proto)
{
- int fd;
+ int fd, type;
+
+#ifdef SOCK_CLOEXEC
+ static int try_sock_cloexec = 1;
+ if (try_sock_cloexec)
+ type = type0|SOCK_CLOEXEC;
+ else
+ type = type0;
+ retry_without_sock_cloexec:;
+#else
+ type = type0;
+#endif
fd = socket(domain, type, proto);
if (fd < 0) {
+#ifdef SOCK_CLOEXEC
+ /* SOCK_CLOEXEC is available since Linux 2.6.27. Linux 2.6.18 fails with EINVAL */
+ if (try_sock_cloexec && errno == EINVAL) {
+ try_sock_cloexec = 0;
+ type = type0;
+ goto retry_without_sock_cloexec;
+ }
+#endif
if (errno == EMFILE || errno == ENFILE) {
rb_gc();
fd = socket(domain, type, proto);
}
}
if (0 <= fd)
- rb_fd_fix_cloexec(fd);
+ rb_update_max_fd(fd);
return fd;
}