mirror of
https://github.com/nginx/nginx.git
synced 2025-06-07 17:52:38 +08:00
Resolver: fixed a race between parallel name and addr resolves.
Previously, ngx_resolve_name() and ngx_resolve_addr() may have rescheduled the resend timer while it was already in progress.
This commit is contained in:
parent
6b18bb541e
commit
e114960e53
@ -875,7 +875,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
|
||||
ngx_add_timer(ctx->event, ctx->timeout);
|
||||
}
|
||||
|
||||
if (ngx_queue_empty(resend_queue)) {
|
||||
if (ngx_resolver_resend_empty(r)) {
|
||||
ngx_add_timer(r->event, (ngx_msec_t) (r->resend_timeout * 1000));
|
||||
}
|
||||
|
||||
@ -1098,7 +1098,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
|
||||
ngx_add_timer(ctx->event, ctx->timeout);
|
||||
}
|
||||
|
||||
if (ngx_queue_empty(resend_queue)) {
|
||||
if (ngx_resolver_resend_empty(r)) {
|
||||
ngx_add_timer(r->event, (ngx_msec_t) (r->resend_timeout * 1000));
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user