diff options
Diffstat (limited to 'ext/socket/tcpserver.c')
| -rw-r--r-- | ext/socket/tcpserver.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ext/socket/tcpserver.c b/ext/socket/tcpserver.c index 2245a0600d..578377b4f9 100644 --- a/ext/socket/tcpserver.c +++ b/ext/socket/tcpserver.c @@ -66,7 +66,7 @@ tcp_accept(VALUE sock) /* * call-seq: - * tcpserver.accept_nonblock => tcpsocket + * tcpserver.accept_nonblock([options]) => tcpsocket * * Accepts an incoming connection using accept(2) after * O_NONBLOCK is set for the underlying file descriptor. @@ -93,12 +93,16 @@ tcp_accept(VALUE sock) * it is extended by IO::WaitReadable. * So IO::WaitReadable can be used to rescue the exceptions for retrying accept_nonblock. * + * By specifying `exception: false`, the options hash allows you to indicate + * that accept_nonblock should not raise an IO::WaitReadable exception, but + * return the symbol :wait_readable instead. + * * === See * * TCPServer#accept * * Socket#accept */ static VALUE -tcp_accept_nonblock(VALUE sock) +tcp_accept_nonblock(int argc, VALUE *argv, VALUE sock) { rb_io_t *fptr; union_sockaddr from; @@ -106,7 +110,7 @@ tcp_accept_nonblock(VALUE sock) GetOpenFile(sock, fptr); fromlen = (socklen_t)sizeof(from); - return rsock_s_accept_nonblock(rb_cTCPSocket, fptr, &from.addr, &fromlen); + return rsock_s_accept_nonblock(argc, argv, rb_cTCPSocket, fptr, &from.addr, &fromlen); } /* @@ -171,7 +175,7 @@ rsock_init_tcpserver(void) */ rb_cTCPServer = rb_define_class("TCPServer", rb_cTCPSocket); rb_define_method(rb_cTCPServer, "accept", tcp_accept, 0); - rb_define_method(rb_cTCPServer, "accept_nonblock", tcp_accept_nonblock, 0); + rb_define_method(rb_cTCPServer, "accept_nonblock", tcp_accept_nonblock, -1); rb_define_method(rb_cTCPServer, "sysaccept", tcp_sysaccept, 0); rb_define_method(rb_cTCPServer, "initialize", tcp_svr_init, -1); rb_define_method(rb_cTCPServer, "listen", rsock_sock_listen, 1); /* in socket.c */ |