shyouhei	2009-02-09 13:42:22 +0900 (Mon, 09 Feb 2009)

  New Revision: 22167

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

  Log:
    merge revision(s) 20166:
    * win32/win32.c (ifs_open_socket): should retry without proto_buffer
      if cannot find the suitable protocol. a patch from Heesob Park.
      fixed [ruby-core:19713]

  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 22166)
+++ ruby_1_8_7/ChangeLog	(revision 22167)
@@ -1,3 +1,9 @@
+Mon Feb  9 13:42:15 2009  NAKAMURA Usaku  <usa@r...>
+
+	* win32/win32.c (ifs_open_socket): should retry without proto_buffer
+	  if cannot find the suitable protocol. a patch from Heesob Park.
+	  fixed [ruby-core:19713]
+
 Mon Feb  9 13:40:21 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* ext/stringio/stringio.c (strio_ungetc): should allow ungetc at
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 22166)
+++ ruby_1_8_7/version.h	(revision 22167)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-02-09"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20090209
-#define RUBY_PATCHLEVEL 109
+#define RUBY_PATCHLEVEL 110
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/win32/win32.c
===================================================================
--- ruby_1_8_7/win32/win32.c	(revision 22166)
+++ ruby_1_8_7/win32/win32.c	(revision 22167)
@@ -2660,6 +2660,8 @@
 		    out = WSASocket(af, type, protocol, &(proto_buffers[i]), 0, 0);
 		    break;
 		}
+		if (out == INVALID_SOCKET)
+		    out = WSASocket(af, type, protocol, NULL, 0, 0);
 	    }
 
 	    free(proto_buffers);

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