usa	2008-11-10 09:57:49 +0900 (Mon, 10 Nov 2008)

  New Revision: 20166

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

  Log:
    * 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/ChangeLog
    branches/ruby_1_8/win32/win32.c
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/win32/win32.c
    trunk/ChangeLog
    trunk/win32/win32.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 20165)
+++ ChangeLog	(revision 20166)
@@ -1,3 +1,9 @@
+Mon Nov 10 09:54:21 2008  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]
+
 Sun Nov  9 13:04:52 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* struct.c (rb_struct_initialize_m): avoid unnecessary array
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 20165)
+++ win32/win32.c	(revision 20166)
@@ -2642,6 +2642,8 @@
 				    WSA_FLAG_OVERLAPPED);
 		    break;
 		}
+		if (out == INVALID_SOCKET)
+		    out = WSASocket(af, type, protocol, NULL, 0, 0);
 	    }
 
 	    free(proto_buffers);
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 20165)
+++ ruby_1_8/ChangeLog	(revision 20166)
@@ -1,3 +1,9 @@
+Mon Nov 10 09:56:11 2008  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]
+
 Sat Nov  8 17:47:28 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* ext/stringio/stringio.c (strio_ungetc): should allow ungetc at
Index: ruby_1_8/win32/win32.c
===================================================================
--- ruby_1_8/win32/win32.c	(revision 20165)
+++ ruby_1_8/win32/win32.c	(revision 20166)
@@ -2663,6 +2663,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);
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20165)
+++ ruby_1_9_1/ChangeLog	(revision 20166)
@@ -1,3 +1,9 @@
+Mon Nov 10 09:56:20 2008  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]
+
 Thu Nov  6 22:05:36 2008  Masaki Suketa  <masaki.suketa@n...>
 
 	* ext/win32ole/win32ole.c (fole_s_connect, fole_initialize,
Index: ruby_1_9_1/win32/win32.c
===================================================================
--- ruby_1_9_1/win32/win32.c	(revision 20165)
+++ ruby_1_9_1/win32/win32.c	(revision 20166)
@@ -2642,6 +2642,8 @@
 				    WSA_FLAG_OVERLAPPED);
 		    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/