From 4d29ea71c5dbb35c0e8a71efd1138ee369fa759b Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 28 Jul 2005 02:33:28 +0000 Subject: * parse.y (f_larglist): allow bv_decl at the end of lambda argument list. [EXPERIMENTAL] * parse.y (new_bv_gen): allow local variable shadowing, with warning in verbose mode. * ext/socket/socket.c (ruby_connect): break immediately if a socket is non-blocking. [ruby-talk:111654] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8855 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/socket.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'ext/socket') diff --git a/ext/socket/socket.c b/ext/socket/socket.c index b51283962..b870677aa 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -916,7 +916,8 @@ wait_connectable0(fd, fds_w, fds_e) int fd; rb_fdset_t *fds_w, *fds_e; { - int sockerr, sockerrlen; + int sockerr; + socklen_t sockerrlen; for (;;) { rb_fd_zero(fds_w); @@ -1011,7 +1012,9 @@ ruby_connect(fd, sockaddr, len, socks) int socks; { int status; +#if defined(HAVE_FCNTL) int mode; +#endif #if WAIT_IN_PROGRESS > 0 int wait_in_progress = -1; int sockerr, sockerrlen; @@ -1055,6 +1058,9 @@ ruby_connect(fd, sockaddr, len, socks) #ifdef EINPROGRESS case EINPROGRESS: #endif +#if defined(HAVE_FCNTL) + if (mode & NONBLOCKING) break; +#endif #if WAIT_IN_PROGRESS > 0 sockerrlen = sizeof(sockerr); status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen); -- cgit