Mercurial > hg > nginx

comparison src/core/ngx_resolver.c @ 6845:9abba5b70ea0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Dmitry Volyntsev <xeioex@nginx.com>
date Fri, 16 Dec 2016 18:21:42 +0300
parents 259e2a76e8fb
children c3a895b94d3f
comparison
equal deleted inserted replaced
6844:259e2a76e8fb 6845:9abba5b70ea0
1554 1554
1555 static ngx_uint_t 1555 static ngx_uint_t
1556 ngx_resolver_resend_empty(ngx_resolver_t *r) 1556 ngx_resolver_resend_empty(ngx_resolver_t *r)
1557 { 1557 {
1558 return ngx_queue_empty(&r->name_resend_queue) 1558 return ngx_queue_empty(&r->name_resend_queue)
1559 && ngx_queue_empty(&r->srv_resend_queue)
1559 #if (NGX_HAVE_INET6) 1560 #if (NGX_HAVE_INET6)
1560 && ngx_queue_empty(&r->addr6_resend_queue) 1561 && ngx_queue_empty(&r->addr6_resend_queue)
1561 #endif 1562 #endif
1562 && ngx_queue_empty(&r->addr_resend_queue); 1563 && ngx_queue_empty(&r->addr_resend_queue);
1563 } 1564 }