diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-14 16:18:41 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-14 16:18:41 +0000 |
commit | ddeb0a4183c74637c23560c9c06c6470721019c9 (patch) | |
tree | 12f1f4c1e243b7a69a75a3727d3d7818c4a2a1aa /ext | |
parent | 1553a85e33585f62909ff5876f4e5b177ffdcee0 (diff) |
* ext/socket/socket.c (s_accept_nonblock): make accepted fd
nonblocking. [ruby-talk:274079]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13699 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/socket/socket.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index ae3e13acdf..17c0cfeb60 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -1464,6 +1464,24 @@ tcp_svr_init(argc, argv, sock) return init_inetsock(sock, Qnil, arg1, Qnil, Qnil, INET_SERVER); } +static void +make_fd_nonblock(int fd) +{ + int flags; +#ifdef F_GETFL + flags = fcntl(fd, F_GETFL); + if (flags == -1) { + rb_sys_fail(0); + } +#else + flags = 0; +#endif + flags |= O_NONBLOCK; + if (fcntl(fd, F_SETFL, flags) == -1) { + rb_sys_fail(0); + } +} + static VALUE s_accept_nonblock(VALUE klass, OpenFile *fptr, struct sockaddr *sockaddr, socklen_t *len) { @@ -1475,6 +1493,7 @@ s_accept_nonblock(VALUE klass, OpenFile *fptr, struct sockaddr *sockaddr, sockle if (fd2 < 0) { rb_sys_fail("accept(2)"); } + make_fd_nonblock(fd2); return init_sock(rb_obj_alloc(klass), fd2); } |