Bug #3124 » patch-ruby_core_29427_2.diff
| ext/socket/raddrinfo.c (working copy) | ||
|---|---|---|
|
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
|
||
|
{
|
||
| test/socket/test_socket.rb (working copy) | ||
|---|---|---|
|
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(Socket.gethostname, 0, Socket::AF_INET, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME) }
|
||
|
assert_nothing_raised('[ruby-core:29427]'){ Socket.getaddrinfo(Socket.gethostname, '0', Socket::AF_INET, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME) }
|
||
|
assert_nothing_raised('[ruby-core:29427]'){ Socket.getaddrinfo(Socket.gethostname, '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
|
||