diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/win32.c | 11 |
3 files changed, 11 insertions, 8 deletions
@@ -1,3 +1,9 @@ +Mon Aug 3 16:28:09 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (rb_w32_connect): return value was broken when some + error occurred. + [ruby-core:24234] + Mon Aug 3 15:48:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * array.c (rb_ary_{permutation,combination}): disallow reentrance @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 264 +#define RUBY_PATCHLEVEL 265 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 diff --git a/win32/win32.c b/win32/win32.c index b948fe0d7..bf405e0e6 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2394,14 +2394,11 @@ rb_w32_connect(int s, const 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; |