mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-11 04:12:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed sorting of getaddrinfo() results.

Browse Source 
Previously the ngx_inet_resolve_host() function sorted addresses in a way that
IPv4 addresses came before IPv6 addresses.  This was implemented in eaf95350d75c
(1.3.10) along with the introduction of getaddrinfo() which could resolve host
names to IPv6 addresses.  Since the "listen" directive only used the first
address, sorting allowed to preserve "listen" compatibility with the previous
behavior and with the behavior of nginx built without IPv6 support.  Now
"listen" uses all resolved addresses which makes sorting pointless.
This commit is contained in:
Roman Arutyunyan 2019-03-20 20:31:59 +03:00
parent 4e17b93eb6
commit b92e8ffa13
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/ngx_inet.c
View File

@ -1080,24 +1080,15 @@ ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u)
/* MP: ngx_shared_palloc() */
/* AF_INET addresses first */
for (rp = res; rp != NULL; rp = rp->ai_next) {
if (rp->ai_family != AF_INET) {
continue;
}
switch (rp->ai_family) {
if (ngx_inet_add_addr(pool, u, rp->ai_addr, rp->ai_addrlen, n)
!= NGX_OK)
{
goto failed;
}
}
case AF_INET:
case AF_INET6:
break;
for (rp = res; rp != NULL; rp = rp->ai_next) {
if (rp->ai_family != AF_INET6) {
default:
continue;
}