Fijxu
/
nginx-quic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolver: fixed CNAME processing for several requests. 

When several requests were waiting for a response, then after getting
a CNAME response only the last request was properly processed, while
others were left waiting.
This commit is contained in:
Ruslan Ermilov 2016-01-26 16:46:38 +03:00
parent 92c27f267f
commit 6c42b28bdd
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/ngx_resolver.c
View File

@ -473,7 +473,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
ngx_int_t rc;
ngx_uint_t naddrs;
ngx_addr_t *addrs;
ngx_resolver_ctx_t *next;
ngx_resolver_ctx_t *next, *last;
ngx_resolver_node_t *rn;
ngx_strlow(ctx->name.data, ctx->name.data, ctx->name.len);
@ -484,6 +484,9 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
if (rn) {
/* ctx can be a list after NGX_RESOLVE_CNAME */
for (last = ctx; last->next; last = last->next);
if (rn->valid >= ngx_time()) {
ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0, "resolve cached");
@ -511,7 +514,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
}
}
ctx->next = rn->waiting;
last->next = rn->waiting;
rn->waiting = NULL;
/* unlock name mutex */
@ -557,7 +560,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
return ngx_resolve_name_locked(r, ctx);
}
ctx->next = rn->waiting;
last->next = rn->waiting;
rn->waiting = NULL;
/* unlock name mutex */
@ -590,7 +593,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
ngx_add_timer(ctx->event, ctx->timeout);
}
ctx->next = rn->waiting;
last->next = rn->waiting;
rn->waiting = ctx;
ctx->state = NGX_AGAIN;
@ -661,8 +664,14 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
ngx_resolver_free(r, rn->name);
ngx_resolver_free(r, rn);
ctx->state = NGX_RESOLVE_NXDOMAIN;
ctx->handler(ctx);
do {
ctx->state = NGX_RESOLVE_NXDOMAIN;
next = ctx->next;
ctx->handler(ctx);
ctx = next;
} while (ctx);
return NGX_OK;
}