From 322fb1129c3f27d6d63bdd49b76df96ffde56f42 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 9 Feb 2009 04:41:54 +0000 Subject: 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] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@22165 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ version.h | 2 +- win32/win32.c | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4ab513fec..c1301f9d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Feb 9 13:41:50 2009 NAKAMURA Usaku + + * 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 * ext/stringio/stringio.c (strio_ungetc): should allow ungetc at diff --git a/version.h b/version.h index 440525dd1..dfdf270e4 100644 --- a/version.h +++ b/version.h @@ -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 diff --git a/win32/win32.c b/win32/win32.c index a5469e7f8..4b83480ff 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2480,6 +2480,8 @@ open_ifs_socket(int af, int type, int protocol) 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); -- cgit