diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-09 04:41:54 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-09 04:41:54 +0000 |
| commit | 322fb1129c3f27d6d63bdd49b76df96ffde56f42 (patch) | |
| tree | d1ecf6d53e4d9d988b64ef474c45c261e7828fb2 | |
| parent | ae06941bbb07721ce76dad0421f6f3cb60987a00 (diff) | |
| download | ruby-322fb1129c3f27d6d63bdd49b76df96ffde56f42.tar.gz ruby-322fb1129c3f27d6d63bdd49b76df96ffde56f42.tar.xz ruby-322fb1129c3f27d6d63bdd49b76df96ffde56f42.zip | |
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
| -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:41:50 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:39:14 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 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); |