diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-28 01:51:59 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-28 01:51:59 +0000 |
| commit | 9c4553e9f8b3b3a06105c90c0b3c972fb2a313cd (patch) | |
| tree | 611df0acbbe30201c8cf43d1fc0ea86e1f7015be | |
| parent | 38d5918439dd6f19e1e2350cb3c37a4331b8abbf (diff) | |
* ext/socket/socket.c (ruby_connect): break immediately if a
socket is non-blocking. [ruby-talk:111654]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8853 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/socket/socket.c | 5 |
2 files changed, 10 insertions, 0 deletions
@@ -5193,6 +5193,11 @@ Wed Sep 8 15:19:49 2004 Hidetoshi NAGAI <[email protected]> * ext/tk/lib/tk/text.rb: add TkText#clear and erase +Tue Sep 7 15:17:49 2004 Nobuyoshi Nakada <[email protected]> + + * ext/socket/socket.c (ruby_connect): break immediately if a + socket is non-blocking. [ruby-talk:111654] + Mon Sep 6 11:08:50 2004 Hirokazu Yamamoto <[email protected]> * ext/tk/lib/tk/menu.rb(TkOptionMenubutton#insert): call correct method diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 68ceb284fe..ec3eb0d453 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); |