traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #15538: Fix compilation of the getnameinfo() / getaddrinfo() emulation code. 

Patch by Philipp Hagemeister.
This commit is contained in:
Antoine Pitrou 2012-08-02 20:37:12 +02:00
parent f37c0c73fe
commit a9a53c7dc0
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -98,6 +98,9 @@ Core and Builtins
Library Library
------- -------
- Issue #15538: Fix compilation of the getnameinfo() / getaddrinfo()
emulation code. Patch by Philipp Hagemeister.
- Issue #9803: Don't close IDLE on saving if breakpoint is open. - Issue #9803: Don't close IDLE on saving if breakpoint is open.
Patch by Roger Serwy. Patch by Roger Serwy.

2
Modules/getaddrinfo.c
View File

@ -430,7 +430,7 @@ getaddrinfo(const char*hostname, const char*servname,
break; break;
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
case AF_INET6: case AF_INET6:
pfx = ((struct in6_addr *)pton)->s6_addr8[0]; pfx = ((struct in6_addr *)pton)->s6_addr[0];
if (pfx == 0 || pfx == 0xfe || pfx == 0xff) if (pfx == 0 || pfx == 0xfe || pfx == 0xff)
pai->ai_flags &= ~AI_CANONNAME; pai->ai_flags &= ~AI_CANONNAME;
break; break;

2
Modules/getnameinfo.c
View File

@ -161,7 +161,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
break; break;
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
case AF_INET6: case AF_INET6:
pfx = ((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr8[0]; pfx = ((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr[0];
if (pfx == 0 || pfx == 0xfe || pfx == 0xff) if (pfx == 0 || pfx == 0xfe || pfx == 0xff)
flags |= NI_NUMERICHOST; flags |= NI_NUMERICHOST;
break; break;