Mercurial > hg > nginx

changeset 7428:cbc5dee8d5d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Resolver: report SRV resolve failure if all A resolves failed. Previously, if an SRV record was successfully resolved, but all of its A records failed to resolve, NXDOMAIN was returned to the caller, which is considered a successful resolve rather than an error. This could result in losing the result of a previous successful resolve by the caller. Now NXDOMAIN is only returned if at least one A resolve completed with this code. Otherwise the error state of the first A resolve is returned.
author Roman Arutyunyan <arut@nginx.com>
date Tue, 11 Dec 2018 19:41:22 +0300
parents 81d49f85afed
children e573d74299a0
files src/core/ngx_resolver.c
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -4266,7 +4266,15 @@ ngx_resolver_report_srv(ngx_resolver_t *
     }
 
     if (naddrs == 0) {
-        ctx->state = NGX_RESOLVE_NXDOMAIN;
+        ctx->state = srvs[0].state;
+
+        for (i = 0; i < nsrvs; i++) {
+            if (srvs[i].state == NGX_RESOLVE_NXDOMAIN) {
+                ctx->state = NGX_RESOLVE_NXDOMAIN;
+                break;
+            }
+        }
+
         ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
 
         ctx->handler(ctx);