diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-29 09:30:46 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-29 09:30:46 +0000 |
| commit | 23e6fc744ef584a04ad29c8fefd8886ce46bf2be (patch) | |
| tree | 4d62f02f47a27882bacd4f549f11ebafccb5b888 | |
| parent | 7701fde3b7e6c5bd2f57ea38814cc405158f88c1 (diff) | |
* ext/socket/socket.c (sock_getaddrinfo): should have updated for
Mac OS X. a patch from Shumpei Akai in [ruby-dev:37234]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20390 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/socket/socket.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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; |