diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-25 14:41:59 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-25 14:41:59 +0000 |
| commit | 7faf411f934072c69b7e3a7ff1c30ffbc80a3f6d (patch) | |
| tree | 7d308f0b17ce487943c492c87b0a02147960fa31 /ext | |
| parent | 88fd031b5dea6154d38248d7c63d8414e0a7d2ab (diff) | |
| download | ruby-7faf411f934072c69b7e3a7ff1c30ffbc80a3f6d.tar.gz | |
* ext/socket/raddrinfo.c (ruby_getaddrinfo__darwin): new workaround for
getaddrinfo problem on Mac OS X Snow Leopard. [ruby-core:29427]
patch by Wataru Kimura. [ruby-core:30842] [Backport #3474]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/socket.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 0d675bc66b..fb0160375b 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -234,6 +234,33 @@ ruby_getnameinfo__aix(sa, salen, host, hostlen, serv, servlen, flags) #endif #endif +static int str_isnumber __P((const char *)); + +#if defined(__APPLE__) +/* fix [ruby-core:29427] */ +static int +ruby_getaddrinfo__darwin(const char *nodename, const char *servname, + struct addrinfo *hints, struct addrinfo **res) +{ + const char *tmp_servname; + struct addrinfo tmp_hints; + tmp_servname = servname; + MEMCPY(&tmp_hints, hints, struct addrinfo, 1); + if (nodename && servname) { + if (str_isnumber(tmp_servname) && atoi(servname) == 0) { + tmp_servname = NULL; +#ifdef AI_NUMERICSERV + if (tmp_hints.ai_flags) tmp_hints.ai_flags &= ~AI_NUMERICSERV; +#endif + } + } + int error = getaddrinfo(nodename, tmp_servname, &tmp_hints, res); + return error; +} +#undef getaddrinfo +#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo__darwin((node),(serv),(hints),(res)) +#endif + #ifdef HAVE_CLOSESOCKET #undef close #define close closesocket |