shyouhei	2009-09-06 01:35:26 +0900 (Sun, 06 Sep 2009)

  New Revision: 24763

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

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

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

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 24762)
+++ ruby_1_8_7/ChangeLog	(revision 24763)
@@ -1,3 +1,9 @@
+Sun Sep  6 01:34:03 2009  NAKAMURA Usaku  <usa@r...>
+
+	* 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  <nobu@r...>
 
 	* io.c (argf_eof): go to the next file if called after ARGF.close
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 24762)
+++ ruby_1_8_7/version.h	(revision 24763)
@@ -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[];
Index: ruby_1_8_7/win32/win32.c
===================================================================
--- ruby_1_8_7/win32/win32.c	(revision 24762)
+++ ruby_1_8_7/win32/win32.c	(revision 24763)
@@ -2473,14 +2473,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/