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

Resolver: use minimum TTL for caching (ticket #329).

Browse Source
This commit is contained in:
Ruslan Ermilov 2013-12-16 19:12:23 +04:00
parent b156dc9635
commit 85e6d211d0
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/ngx_resolver.c
View File

@ -678,6 +678,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
rn->code = 0;
rn->cnlen = 0;
rn->valid = 0;
rn->ttl = NGX_MAX_UINT32_VALUE;
rn->waiting = ctx;
ctx->state = NGX_AGAIN;
@ -871,6 +872,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
rn->name = NULL;
rn->nlen = 0;
rn->valid = 0;
rn->ttl = NGX_MAX_UINT32_VALUE;
rn->waiting = ctx;
/* unlock addr mutex */
@ -1574,7 +1576,6 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
i = ans;
naddrs = 0;
cname = NULL;
ttl = 0;
for (a = 0; a < nan; a++) {
@ -1628,6 +1629,8 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
ttl = 0;
}
rn->ttl = ngx_min(rn->ttl, (uint32_t) ttl);
i += sizeof(ngx_resolver_an_t);
switch (type) {
@ -1694,8 +1697,8 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
}
ngx_log_debug3(NGX_LOG_DEBUG_CORE, r->log, 0,
"resolver naddrs:%ui cname:%p ttl:%d",
naddrs, cname, ttl);
"resolver naddrs:%ui cname:%p ttl:%uD",
naddrs, cname, rn->ttl);
if (naddrs) {
@ -1746,8 +1749,6 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
#endif
}
rn->ttl = ttl;
n = 0;
i = ans;
@ -1915,7 +1916,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
rn->cnlen = (u_short) name.len;
rn->u.cname = name.data;
rn->valid = ngx_time() + (r->valid ? r->valid : ttl);
rn->valid = ngx_time() + (r->valid ? r->valid : (time_t) rn->ttl);
rn->expire = ngx_time() + r->expire;
ngx_queue_insert_head(&r->name_expire_queue, &rn->queue);