# HG changeset patch
# User Dmitry Volyntsev <xeioex@nginx.com>
# Date 1481901715 -10800
# Node ID c3a895b94d3fd219ca67eb9069b233116754817d
# Parent  9abba5b70ea0134eeaf6796de27f5ec6bbd6bdfd
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.

diff -r 9abba5b70ea0 -r c3a895b94d3f src/core/ngx_resolver.c
--- a/src/core/ngx_resolver.c	Fri Dec 16 18:21:42 2016 +0300
+++ b/src/core/ngx_resolver.c	Fri Dec 16 18:21:55 2016 +0300
@@ -875,7 +875,7 @@
         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_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));
     }