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 | 43c356ce8cc29f902fbdac175f741687ef0bde85 (patch) | |
| tree | 0106d0f9cd92e6ec0d80e23b48691c948c74c06c | |
| parent | 6f4fee856ced6d11e4e485d071e1b70848b60e8e (diff) | |
| download | ruby-43c356ce8cc29f902fbdac175f741687ef0bde85.tar.gz ruby-43c356ce8cc29f902fbdac175f741687ef0bde85.tar.xz ruby-43c356ce8cc29f902fbdac175f741687ef0bde85.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/branches/ruby_1_8@8894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/socket/socket.c | 8 |
2 files changed, 7 insertions, 6 deletions
@@ -1,3 +1,8 @@ +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] + Tue Aug 2 10:20:54 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * ext/tcltklib/tcltklib.c: use Tcl_[GS]etVar2Ex instead of diff --git a/ext/socket/socket.c b/ext/socket/socket.c index ec3eb0d45..91aa53c16 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -875,7 +875,8 @@ static int wait_connectable(fd) int fd; { - int sockerr, sockerrlen; + int sockerr; + socklen_t sockerrlen; fd_set fds_w; fd_set fds_e; @@ -929,9 +930,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; @@ -975,9 +974,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); |