ruby-changes:10609
From: shyouhei <ko1@a...>
Date: Mon, 9 Feb 2009 13:43:00 +0900 (JST)
Subject: [ruby-changes:10609] Ruby:r22165 (ruby_1_8_6): merge revision(s) 20166:
shyouhei 2009-02-09 13:41:54 +0900 (Mon, 09 Feb 2009) New Revision: 22165 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22165 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_6/ChangeLog branches/ruby_1_8_6/version.h branches/ruby_1_8_6/win32/win32.c Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 22164) +++ ruby_1_8_6/ChangeLog (revision 22165) @@ -1,3 +1,9 @@ +Mon Feb 9 13:41:50 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:39:14 2009 Yukihiro Matsumoto <matz@r...> * ext/stringio/stringio.c (strio_ungetc): should allow ungetc at Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 22164) +++ ruby_1_8_6/version.h (revision 22165) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-02-09" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20090209 -#define RUBY_PATCHLEVEL 323 +#define RUBY_PATCHLEVEL 324 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 Index: ruby_1_8_6/win32/win32.c =================================================================== --- ruby_1_8_6/win32/win32.c (revision 22164) +++ ruby_1_8_6/win32/win32.c (revision 22165) @@ -2480,6 +2480,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/