summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/socket.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3976cd804c..a6fa48787f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Nov 29 18:28:57 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/socket/socket.c (sock_getaddrinfo): should have updated for
+ Mac OS X. a patch from Shumpei Akai in [ruby-dev:37234]
+
Sat Nov 29 00:18:30 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* cont.c (fiber_alloc): separate allocation and initialization.
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index fc7388083e..2f7a07f864 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -953,7 +953,7 @@ sock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints)
struct addrinfo *r;
r = res;
while (r) {
- if (! r->ai_socktype) r->ai_socktype = hints.ai_socktype;
+ if (! r->ai_socktype) r->ai_socktype = hints->ai_socktype;
if (! r->ai_protocol) {
if (r->ai_socktype == SOCK_DGRAM) {
r->ai_protocol = IPPROTO_UDP;