summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-17 07:49:51 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-17 07:49:51 +0000
commitfae330b3b90572ef55f6ffd9b67c2c6fa7f5f526 (patch)
treec82e243df19bbe5c4622a8ed31e360bf01371548
parentb85504f0e9b9f9797fffc75d9cf4c688a78035c4 (diff)
* ext/socket/socket.c (ruby_connect): select() for connect() has
mean only when the socket is non-blocking. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/socket.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d53f75f74..2d28af6820 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 17 16:48:40 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/socket/socket.c (ruby_connect): select() for connect() has
+ mean only when the socket is non-blocking.
+
Thu Jul 17 10:55:24 2008 Eric Hodel <drbrain@segment7.net>
* mkconfig.rb: Simplify expression for RDoc.
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 14ed6fe963..67573a663a 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -1177,7 +1177,6 @@ ruby_connect(int fd, const struct sockaddr *sockaddr, int len, int socks)
if (socks) func = socks_connect_blocking;
#endif
for (;;) {
- rb_thread_fd_writable(fd);
status = BLOCKING_REGION(func, &arg);
if (status < 0) {
switch (errno) {