From 0cf8e3072c2d08f6cd0f768b9ef27a5d0f3161ef Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 5 Sep 2009 16:35:26 +0000 Subject: merge revision(s) 24369: * win32/win32.c (rb_w32_connect): return value was broken when some error occurred. [ruby-core:24234] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@24763 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ version.h | 8 ++++---- win32/win32.c | 11 ++++------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index d59f4ce62b..7b1490343a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Sep 6 01:34:03 2009 NAKAMURA Usaku + + * win32/win32.c (rb_w32_connect): return value was broken when some + error occurred. + [ruby-core:24234] + Fri Sep 4 10:03:22 2009 Nobuyoshi Nakada * io.c (argf_eof): go to the next file if called after ARGF.close diff --git a/version.h b/version.h index a7a440f20e..518311a6dd 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-09-04" +#define RUBY_RELEASE_DATE "2009-09-06" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20090904 -#define RUBY_PATCHLEVEL 197 +#define RUBY_RELEASE_CODE 20090906 +#define RUBY_PATCHLEVEL 198 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 4 +#define RUBY_RELEASE_DAY 6 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; diff --git a/win32/win32.c b/win32/win32.c index 165cdc6b29..b5cd90dbb7 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2473,14 +2473,11 @@ rb_w32_connect(int s, struct sockaddr *addr, int addrlen) RUBY_CRITICAL({ r = connect(TO_SOCKET(s), addr, addrlen); if (r == SOCKET_ERROR) { - r = WSAGetLastError(); - if (r != WSAEWOULDBLOCK) { - errno = map_errno(r); - } - else { + int err = WSAGetLastError(); + if (err != WSAEWOULDBLOCK) + errno = map_errno(err); + else errno = EINPROGRESS; - r = -1; - } } }); return r; -- cgit v1.2.3