diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-23 12:25:07 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-23 12:25:07 +0000 |
| commit | acb8b3f7a99cd692da469e8ee729a6b6ec11c85d (patch) | |
| tree | 72696fd824ed7cd4b5ca93adfbf73bcceb7d5647 | |
| parent | 80684e9c09338adcbbf1bc4827938f28178e84c1 (diff) | |
* 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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/socket/raddrinfo.c | 27 | ||||
| -rw-r--r-- | test/socket/test_socket.rb | 9 |
3 files changed, 42 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Wed Jun 23 21:17:32 2010 Tanaka Akira <akr@fsij.org> + + * 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] + Wed Jun 23 17:12:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * NEWS (ptr): new method and deprecated methods. [ruby-dev:41681] diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index 5478d1006c..204588f7a0 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -97,6 +97,33 @@ ruby_getnameinfo__aix(const struct sockaddr *sa, size_t salen, ruby_getnameinfo__aix((sa), (salen), (host), (hostlen), (serv), (servlen), (flags)) #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 + #ifndef GETADDRINFO_EMU struct getaddrinfo_arg { diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb index 999976b999..179e83f316 100644 --- a/test/socket/test_socket.rb +++ b/test/socket/test_socket.rb @@ -60,6 +60,15 @@ class TestSocket < Test::Unit::TestCase assert_raise(SocketError) { Socket.getaddrinfo("www.kame.net", 80, "AF_UNIX") } end + def test_getaddrinfo_raises_no_errors_on_port_argument_of_0 # [ruby-core:29427] + assert_nothing_raised('[ruby-core:29427]'){ Socket.getaddrinfo('localhost', 0, Socket::AF_INET, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME) } + assert_nothing_raised('[ruby-core:29427]'){ Socket.getaddrinfo('localhost', '0', Socket::AF_INET, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME) } + assert_nothing_raised('[ruby-core:29427]'){ Socket.getaddrinfo('localhost', '00', Socket::AF_INET, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME) } + assert_raise(SocketError, '[ruby-core:29427]'){ Socket.getaddrinfo(nil, nil, Socket::AF_INET, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME) } + assert_nothing_raised('[ruby-core:29427]'){ TCPServer.open('localhost', 0) {} } + end + + def test_getnameinfo assert_raise(SocketError) { Socket.getnameinfo(["AF_UNIX", 80, "0.0.0.0"]) } end |