From 0d4264f7175b70702d21f852b2c38319a4cdcd05 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 2 Aug 2005 23:25:35 +0000
Subject: [PATCH] * ext/socket/socket.c (ruby_connect): revert
 [ruby-talk:111654]   changes at 2004-09-07.  [ruby-dev:26656]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog           | 5 +++++
 ext/socket/socket.c | 8 ++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 00a8212b95..b45af9cff2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 ec3eb0d453..91aa53c163 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);