yugui	2009-08-09 00:32:23 +0900 (Sun, 09 Aug 2009)

  New Revision: 24460

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24460

  Log:
    merges r24367 from trunk into ruby_1_9_1.
    --
    * win32/win32.c (rb_w32_connect): return value was broken when some
      error occurred.
      [ruby-core:24234]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/version.h
    branches/ruby_1_9_1/win32/win32.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24459)
+++ ruby_1_9_1/ChangeLog	(revision 24460)
@@ -1,3 +1,9 @@
+Mon Aug  3 16:28:09 2009  NAKAMURA Usaku  <usa@r...>
+
+	* 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@r...>
 
 	* array.c (rb_ary_{permutation,combination}): disallow reentrance
Index: ruby_1_9_1/win32/win32.c
===================================================================
--- ruby_1_9_1/win32/win32.c	(revision 24459)
+++ ruby_1_9_1/win32/win32.c	(revision 24460)
@@ -2394,14 +2394,11 @@
     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;
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24459)
+++ ruby_1_9_1/version.h	(revision 24460)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/