From 8d5d5e068643008e04b6adb877c66471390c48aa Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 28 Jul 2005 01:51:59 +0000 Subject: * 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/branches/ruby_1_8@8853 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/socket.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ext/socket') diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 68ceb284f..ec3eb0d45 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -929,7 +929,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; @@ -973,6 +975,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