1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/socket/socket.c (ruby_connect): EALREADY is the equivalent

Browse Source 
for EINPROGRESS in ws2_32.lib.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1766 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eban 2001-10-04 05:32:09 +00:00
parent 822f1a5a59
commit ffcdd05412
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 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. * ext/gdbm/gdbm.c (rb_gdbm_fetch): str is a VALUE now.

4
ext/socket/socket.c
View File

@ -747,6 +747,7 @@ ruby_connect(fd, sockaddr, len, socks)
#ifdef EINPROGRESS #ifdef EINPROGRESS
case EINPROGRESS: case EINPROGRESS:
#if defined __CYGWIN__ #if defined __CYGWIN__
case EALREADY:
wait_in_progress = 10; wait_in_progress = 10;
#endif #endif
#endif #endif
@ -754,9 +755,8 @@ ruby_connect(fd, sockaddr, len, socks)
continue; continue;
#if defined __CYGWIN__ #if defined __CYGWIN__
case EALREADY:
case EINVAL: case EINVAL:
if (--wait_in_progress > 0) { if (wait_in_progress-- > 0) {
struct timeval tv = {0, 100000}; struct timeval tv = {0, 100000};
rb_thread_wait_for(tv); rb_thread_wait_for(tv);
continue; continue;

4
version.h
View File

@ -1,4 +1,4 @@
#define RUBY_VERSION "1.7.1" #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_VERSION_CODE 171
#define RUBY_RELEASE_CODE 20011002 #define RUBY_RELEASE_CODE 20011004