diff options
| author | Dmitry Volyntsev <xeioex@nginx.com> | 2016-12-16 18:21:42 +0300 |
|---|---|---|
| committer | Dmitry Volyntsev <xeioex@nginx.com> | 2016-12-16 18:21:42 +0300 |
| commit | 6b18bb541e81acdc42968071d200c03f9ef8d4a1 (patch) | |
| tree | bff8c0d5b38c78fd32da467001eb4900664cda2b /src | |
| parent | 3a8532219a0531d5fbb33e7f4c2f9531c4c924b9 (diff) | |
| download | nginx-6b18bb541e81acdc42968071d200c03f9ef8d4a1.tar.gz nginx-6b18bb541e81acdc42968071d200c03f9ef8d4a1.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ngx_resolver.c | 1 |
1 files changed, 1 insertions, 0 deletions
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 |