Resolver: notify all waiting requests on timeout. If a "resolver_timeout" occurs, only the first waiting request was notified. Other requests may hang forever.
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c index dfe3dcb..5f78978 100644 --- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c
@@ -417,7 +417,7 @@ /* lock name mutex */ - if (ctx->state == NGX_AGAIN || ctx->state == NGX_RESOLVE_TIMEDOUT) { + if (ctx->state == NGX_AGAIN) { hash = ngx_crc32_short(ctx->name.data, ctx->name.len); @@ -664,7 +664,7 @@ } ctx->event->handler = ngx_resolver_timeout_handler; - ctx->event->data = ctx; + ctx->event->data = rn; ctx->event->log = r->log; ctx->ident = -1; @@ -857,7 +857,7 @@ } ctx->event->handler = ngx_resolver_timeout_handler; - ctx->event->data = ctx; + ctx->event->data = rn; ctx->event->log = r->log; ctx->ident = -1; @@ -949,7 +949,7 @@ /* lock addr mutex */ - if (ctx->state == NGX_AGAIN || ctx->state == NGX_RESOLVE_TIMEDOUT) { + if (ctx->state == NGX_AGAIN) { switch (ctx->addr.sockaddr->sa_family) { @@ -2790,13 +2790,21 @@ static void ngx_resolver_timeout_handler(ngx_event_t *ev) { - ngx_resolver_ctx_t *ctx; + ngx_resolver_ctx_t *ctx, *next; + ngx_resolver_node_t *rn; - ctx = ev->data; + rn = ev->data; + ctx = rn->waiting; + rn->waiting = NULL; - ctx->state = NGX_RESOLVE_TIMEDOUT; + do { + ctx->state = NGX_RESOLVE_TIMEDOUT; + next = ctx->next; - ctx->handler(ctx); + ctx->handler(ctx); + + ctx = next; + } while (ctx); }