usa	2009-08-03 17:24:56 +0900 (Mon, 03 Aug 2009)

  New Revision: 24369

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

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

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/win32/win32.c

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 24368)
+++ ruby_1_8/ChangeLog	(revision 24369)
@@ -1,3 +1,9 @@
+Mon Aug  3 17:24:30 2009  NAKAMURA Usaku  <usa@r...>
+
+	* win32/win32.c (rb_w32_connect): return value was broken when some
+	  error occurred.
+	  [ruby-core:24234]
+
 Sun Aug  2 06:08:17 2009  URABE Shyouhei  <shyouhei@r...>
 
 	* node.h (rb_thread_status): ISO C89 do not allow a comma at the end of enum.
Index: ruby_1_8/win32/win32.c
===================================================================
--- ruby_1_8/win32/win32.c	(revision 24368)
+++ ruby_1_8/win32/win32.c	(revision 24369)
@@ -2490,14 +2490,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;

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