Resolver: introduced valid field in resolver responses.

It hints the amount of time a response could be considered
as valid.

diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 7f0d3ad2a3de36553d4d4f5e73b6aafbe71d99ee..40eefc5e389a48c432125f7ce77ee7e621564074 100644 (file)
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -551,6 +551,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
 
                 do {
                     ctx->state = NGX_OK;
+                    ctx->valid = rn->valid;
                     ctx->naddrs = naddrs;
 
                     if (addrs == NULL) {
@@ -597,6 +598,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
 
             do {
                 ctx->state = NGX_RESOLVE_NXDOMAIN;
+                ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
                 next = ctx->next;
 
                 ctx->handler(ctx);
@@ -859,6 +861,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
             /* unlock addr mutex */
 
             ctx->state = NGX_OK;
+            ctx->valid = rn->valid;
 
             ctx->handler(ctx);
 
@@ -1948,6 +1951,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t n,
         while (next) {
             ctx = next;
             ctx->state = code;
+            ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
             next = ctx->next;
 
             ctx->handler(ctx);
@@ -2262,6 +2266,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t n,
         while (next) {
             ctx = next;
             ctx->state = NGX_OK;
+            ctx->valid = rn->valid;
             ctx->naddrs = naddrs;
 
             if (addrs == NULL) {
@@ -2541,6 +2546,7 @@ valid:
         while (next) {
             ctx = next;
             ctx->state = code;
+            ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
             next = ctx->next;
 
             ctx->handler(ctx);
@@ -2675,6 +2681,7 @@ ptr:
     while (next) {
         ctx = next;
         ctx->state = NGX_OK;
+        ctx->valid = rn->valid;
         ctx->name = name;
         next = ctx->next;
 

diff --git a/src/core/ngx_resolver.h b/src/core/ngx_resolver.h
index 3165abd490502461402bc48c793cb1ff82932b14..3e93f4dac78420e9d7071215f5e3aac228077268 100644 (file)
--- a/src/core/ngx_resolver.h
+++ b/src/core/ngx_resolver.h
@@ -164,6 +164,7 @@ struct ngx_resolver_ctx_s {
     ngx_int_t                 state;
     ngx_str_t                 name;
 
+    time_t                    valid;
     ngx_uint_t                naddrs;
     ngx_addr_t               *addrs;
     ngx_addr_t                addr;