From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Fri, 16 Dec 2016 15:21:42 +0000 (+0300)
Subject: Resolver: fixed possible premature stop of the resend timer.
X-Git-Tag: release-1.11.8~19
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/static/gitweb.js?a=commitdiff_plain;h=6b18bb541e81acdc42968071d200c03f9ef8d4a1;p=nginx.git

Resolver: fixed possible premature stop of the resend timer.

Previously, ngx_resolve_name_done() and ngx_resolve_addr_done()
may have stopped the resend timer prematurely while srv_resend_queue
was not empty.
---

diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index fc25c6633..d5f06eb1d 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -1556,6 +1556,7 @@ static ngx_uint_t
 ngx_resolver_resend_empty(ngx_resolver_t *r)
 {
     return ngx_queue_empty(&r->name_resend_queue)
+           && ngx_queue_empty(&r->srv_resend_queue)
 #if (NGX_HAVE_INET6)
            && ngx_queue_empty(&r->addr6_resend_queue)
 #endif