summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-09 04:41:54 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-09 04:41:54 (GMT)
commitfc601f0f64701e8e95f69e19e1c8b34515ad7a81 (patch)
treed1ecf6d53e4d9d988b64ef474c45c261e7828fb2
parent783b5e40d8d040b3bce4f61a15267418571e063c (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_6@22165 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--version.h2
-rw-r--r--win32/win32.c2
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4ab513f..c1301f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/version.h b/version.h
index 440525d..dfdf270 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 a5469e7..4b83480 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);