diff options
Diffstat (limited to 'ext/socket/init.c')
| -rw-r--r-- | ext/socket/init.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ext/socket/init.c b/ext/socket/init.c index 157d6706a6..24b9b00e15 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -435,7 +435,7 @@ rsock_socket0(int domain, int type, int proto) static int cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */ if (cloexec_state > 0) { /* common path, if SOCK_CLOEXEC is defined */ - ret = socket(domain, type|SOCK_CLOEXEC, proto); + ret = socket(domain, type|SOCK_CLOEXEC|SOCK_NONBLOCK, proto); if (ret >= 0) { if (ret <= 2) goto fix_cloexec; @@ -443,7 +443,7 @@ rsock_socket0(int domain, int type, int proto) } } else if (cloexec_state < 0) { /* usually runs once only for detection */ - ret = socket(domain, type|SOCK_CLOEXEC, proto); + ret = socket(domain, type|SOCK_CLOEXEC|SOCK_NONBLOCK, proto); if (ret >= 0) { cloexec_state = rsock_detect_cloexec(ret); if (cloexec_state == 0 || ret <= 2) @@ -466,6 +466,7 @@ rsock_socket0(int domain, int type, int proto) return -1; fix_cloexec: rb_maygvl_fd_fix_cloexec(ret); + rsock_make_fd_nonblock(ret); update_max_fd: rb_update_max_fd(ret); @@ -632,8 +633,8 @@ rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks) return status; } -static void -make_fd_nonblock(int fd) +void +rsock_make_fd_nonblock(int fd) { int flags; #ifdef F_GETFL @@ -659,6 +660,7 @@ cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len, #ifdef HAVE_ACCEPT4 static int try_accept4 = 1; #endif + nonblock = 1; /* TODO remove parameter */ if (address_len) len0 = *address_len; #ifdef HAVE_ACCEPT4 if (try_accept4) { @@ -678,7 +680,7 @@ cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len, rb_maygvl_fd_fix_cloexec(ret); #ifndef SOCK_NONBLOCK if (nonblock) { - make_fd_nonblock(ret); + rsock_make_fd_nonblock(ret); } #endif if (address_len && len0 < *address_len) *address_len = len0; @@ -695,7 +697,7 @@ cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len, if (address_len && len0 < *address_len) *address_len = len0; rb_maygvl_fd_fix_cloexec(ret); if (nonblock) { - make_fd_nonblock(ret); + rsock_make_fd_nonblock(ret); } return ret; } |