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: limited CNAME recursion.

Browse Source 
Previously, the recursion was only limited for cached responses.
This commit is contained in:
Ruslan Ermilov 2016-01-26 16:47:14 +03:00
parent a3d42258d9
commit fe89d99796
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/ngx_resolver.c
View File

@ -2001,11 +2001,33 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
ngx_queue_insert_head(&r->name_expire_queue, &rn->queue);
ngx_resolver_free(r, rn->query);
rn->query = NULL;
#if (NGX_HAVE_INET6)
rn->query6 = NULL;
#endif
ctx = rn->waiting;
rn->waiting = NULL;
if (ctx) {
if (ctx->recursion++ >= NGX_RESOLVER_MAX_RECURSION) {
/* unlock name mutex */
do {
ctx->state = NGX_RESOLVE_NXDOMAIN;
next = ctx->next;
ctx->handler(ctx);
ctx = next;
} while (ctx);
return;
}
for (next = ctx; next; next = next->next) {
next->node = NULL;
}
@ -2013,12 +2035,6 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
(void) ngx_resolve_name_locked(r, ctx, &name);
}
ngx_resolver_free(r, rn->query);
rn->query = NULL;
#if (NGX_HAVE_INET6)
rn->query6 = NULL;
#endif
/* unlock name mutex */
return;