summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-06-22 14:44:44 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-06-22 14:44:44 +0000
commit2cf4fce053779fea72d34656ff43886acf7e5a93 (patch)
tree01e2cfb5280841af64ec6ff3f3f6b376e17f1b7b
parentcdabb04b442dcbe58e201c18aa8aec80b2d63a02 (diff)
* ext/socket/socket.c (ruby_connect): workaround for the setup of
Cygwin socket. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1538 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/socket.c8
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bb579066c2..1636b175cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 22 23:17:28 2001 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/socket/socket.c (ruby_connect): workaround for the setup of
+ Cygwin socket.
+
Fri Jun 22 23:11:17 2001 Keiju Ishitsuka <keiju@ishitsuka.com>
* lib/irb/locale.rb: fix for require "kconv" problem
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index f104d4eb4e..586fb9230b 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -743,6 +743,14 @@ ruby_connect(fd, sockaddr, len, socks)
case EAGAIN:
#ifdef EINPROGRESS
case EINPROGRESS:
+#if defined __CYGWIN__
+ {
+ struct timeval tv;
+ tv.tv_sec = 0;
+ tv.tv_usec = 100000;
+ rb_thread_wait_for(&tv);
+ }
+#endif
#endif
thread_write_select(fd);
continue;