Mercurial > hg > nginx

changeset 7479:8be88b22fe81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed sorting of getaddrinfo() results. 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.
author Roman Arutyunyan <arut@nginx.com>
date Wed, 20 Mar 2019 20:31:59 +0300
parents 4f9b72a229c1
children d9c3917c7f90
files src/core/ngx_inet.c
diffstat 1 files changed, 5 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -1080,24 +1080,15 @@ ngx_inet_resolve_host(ngx_pool_t *pool, 
 
     /* 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;
         }