summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-10 00:57:49 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-10 00:57:49 +0000
commit1cd9e3398ae5dcdd016c8ff543ac235bfe4990e7 (patch)
treee95dca6b0fd573eaa3a3099990748d1f8f8aa024
parent703f16baebb870adc5040fdcc82d1ea87ff05b67 (diff)
* 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_9_1@20166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--win32/win32.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c975b2cf1d..75aa044717 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov 10 09:56:20 2008 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]
+
Thu Nov 6 22:05:36 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (fole_s_connect, fole_initialize,
diff --git a/win32/win32.c b/win32/win32.c
index 50fd55d076..ae692ce9f0 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -2642,6 +2642,8 @@ open_ifs_socket(int af, int type, int protocol)
WSA_FLAG_OVERLAPPED);
break;
}
+ if (out == INVALID_SOCKET)
+ out = WSASocket(af, type, protocol, NULL, 0, 0);
}
free(proto_buffers);