diff options
author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-10-04 05:32:09 +0000 |
---|---|---|
committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-10-04 05:32:09 +0000 |
commit | ffcdd05412e8120d604810f2f0936c58c825ab97 (patch) | |
tree | 3779176cea672af898393b58e53e1eab41a3cf36 | |
parent | 822f1a5a59fda892bb33020c6e3fdcdb25a6a8c0 (diff) | |
download | ruby-ffcdd05412e8120d604810f2f0936c58c825ab97.tar.gz |
* ext/socket/socket.c (ruby_connect): EALREADY is the equivalent
for EINPROGRESS in ws2_32.lib.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1766 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/socket/socket.c | 4 | ||||
-rw-r--r-- | version.h | 4 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Thu Oct 4 14:11:03 2001 WATANABE Hirofumi <eban@ruby-lang.org> + + * ext/socket/socket.c (ruby_connect): EALREADY is the equivalent + for EINPROGRESS in ws2_32.lib. + Wed Oct 3 16:49:49 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp> * ext/gdbm/gdbm.c (rb_gdbm_fetch): str is a VALUE now. diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 5b7d8ebefb..8974096bbc 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -747,6 +747,7 @@ ruby_connect(fd, sockaddr, len, socks) #ifdef EINPROGRESS case EINPROGRESS: #if defined __CYGWIN__ + case EALREADY: wait_in_progress = 10; #endif #endif @@ -754,9 +755,8 @@ ruby_connect(fd, sockaddr, len, socks) continue; #if defined __CYGWIN__ - case EALREADY: case EINVAL: - if (--wait_in_progress > 0) { + if (wait_in_progress-- > 0) { struct timeval tv = {0, 100000}; rb_thread_wait_for(tv); continue; @@ -1,4 +1,4 @@ #define RUBY_VERSION "1.7.1" -#define RUBY_RELEASE_DATE "2001-10-02" +#define RUBY_RELEASE_DATE "2001-10-04" #define RUBY_VERSION_CODE 171 -#define RUBY_RELEASE_CODE 20011002 +#define RUBY_RELEASE_CODE 20011004 |