mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-28 02:02:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolver: fixed a race between parallel name and addr resolves.

Browse Source 
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:
Dmitry Volyntsev 2016-12-16 18:21:55 +03:00
parent 6b18bb541e
commit e114960e53
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/ngx_resolver.c
View File

@ -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));
}