nginx: src/core/ngx_resolver.c comparison

Resolver: limited CNAME recursion. Previously, the recursion was only limited for cached responses.

comparison

equal deleted inserted replaced

-:497d0cff8ace
+:ff9b32c0e141
 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);
+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;
 }
 (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;
 }

Mercurial > hg > nginx