diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-09 04:42:22 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-09 04:42:22 +0000 |
commit | 7e7ae14016dcc7df0f2fb3d5f2d2f9f7fcc31397 (patch) | |
tree | 635c67920813bd5dc59b8f893fbdfbff60f7daad | |
parent | d8646119b7e2f616e6c36cb50d56b027091db8d4 (diff) |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@22167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | win32/win32.c | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Mon Feb 9 13:42:15 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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@ruby-lang.org> * ext/stringio/stringio.c (strio_ungetc): should allow ungetc at @@ -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 diff --git a/win32/win32.c b/win32/win32.c index d128713a21..8fb1d2d860 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2660,6 +2660,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); |