summaryrefslogtreecommitdiffstats
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
commit5cb106435e680b99b849580d98a6c10d13d66b3e (patch)
treef6afc76a62d1f33e49d0d63fed51a06dfc3ffb42
parenteea600ca5a80eb876a73da33c900acba0e312f8f (diff)
downloadruby-5cb106435e680b99b849580d98a6c10d13d66b3e.tar.gz
ruby-5cb106435e680b99b849580d98a6c10d13d66b3e.tar.xz
ruby-5cb106435e680b99b849580d98a6c10d13d66b3e.zip
* 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/trunk@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 9d90ff94c..68ad46b59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov 10 09:54:21 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]
+
Sun Nov 9 13:04:52 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* struct.c (rb_struct_initialize_m): avoid unnecessary array
diff --git a/win32/win32.c b/win32/win32.c
index 50fd55d07..ae692ce9f 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);