diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-02 23:25:35 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-02 23:25:35 +0000 |
| commit | 9c98a23f732f34690ad15e7cf0151a5409faff12 (patch) | |
| tree | 82a92dceedbfa8dbad72d1b8e002b221617a3e33 | |
| parent | 2f3270ea7b9893b459139d7e8c0e4240a97bf871 (diff) | |
| download | ruby-9c98a23f732f34690ad15e7cf0151a5409faff12.tar.gz ruby-9c98a23f732f34690ad15e7cf0151a5409faff12.tar.xz ruby-9c98a23f732f34690ad15e7cf0151a5409faff12.zip | |
* ext/socket/socket.c (ruby_connect): revert [ruby-talk:111654]
changes at 2004-09-07. [ruby-dev:26656]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/socket/socket.c | 5 |
2 files changed, 6 insertions, 6 deletions
@@ -1,7 +1,12 @@ +Wed Aug 3 08:22:13 2005 Yukihiro Matsumoto <matz@ruby-lang.org> + + * ext/socket/socket.c (ruby_connect): revert [ruby-talk:111654] + changes at 2004-09-07. [ruby-dev:26656] + Wed Aug 3 06:53:35 2005 Yukihiro Matsumoto <matz@ruby-lang.org> * array.c (rb_ary_or): wraps the operand in an array if it is not - an array. [ruby-talk:150495] + an array. [ruby-talk:150495] [EXPERIMENTAL] * array.c (rb_ary_and, rb_ary_plus, rb_ary_diff): ditto. diff --git a/ext/socket/socket.c b/ext/socket/socket.c index b870677aa..ca805e5ec 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -1012,9 +1012,7 @@ 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; @@ -1058,9 +1056,6 @@ 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); |