diff options
| author | Dmitry Volyntsev <xeioex@nginx.com> | 2016-03-23 17:44:36 +0300 |
|---|---|---|
| committer | Dmitry Volyntsev <xeioex@nginx.com> | 2016-03-23 17:44:36 +0300 |
| commit | 2b2fe92aaa84c89a36eb3a286f26c2499dc4e275 (patch) | |
| tree | fa778aa940cbc6e3a4da8856a85a6f4a2938ef50 | |
| parent | 98f222c6c115e578d95cf7cf4e657dac32d0f44c (diff) | |
| download | nginx-2b2fe92aaa84c89a36eb3a286f26c2499dc4e275.tar.gz nginx-2b2fe92aaa84c89a36eb3a286f26c2499dc4e275.zip | |
Resolver: do not enable resolve timer if provided timeout is zero.
| -rw-r--r-- | src/core/ngx_resolver.c | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c index 40eefc5e3..fdbd8aed3 100644 --- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c @@ -611,7 +611,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx, if (rn->waiting) { - if (ctx->event == NULL) { + if (ctx->event == NULL && ctx->timeout) { ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t)); if (ctx->event == NULL) { return NGX_ERROR; @@ -729,7 +729,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx, goto failed; } - if (ctx->event == NULL) { + if (ctx->event == NULL && ctx->timeout) { ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t)); if (ctx->event == NULL) { goto failed; @@ -872,17 +872,19 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx) if (rn->waiting) { - ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t)); - if (ctx->event == NULL) { - return NGX_ERROR; - } + if (ctx->event == NULL && ctx->timeout) { + ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t)); + if (ctx->event == NULL) { + return NGX_ERROR; + } - ctx->event->handler = ngx_resolver_timeout_handler; - ctx->event->data = ctx; - ctx->event->log = r->log; - ctx->ident = -1; + ctx->event->handler = ngx_resolver_timeout_handler; + ctx->event->data = ctx; + ctx->event->log = r->log; + ctx->ident = -1; - ngx_add_timer(ctx->event, ctx->timeout); + ngx_add_timer(ctx->event, ctx->timeout); + } ctx->next = rn->waiting; rn->waiting = ctx; @@ -949,17 +951,19 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx) goto failed; } - ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t)); - if (ctx->event == NULL) { - goto failed; - } + if (ctx->event == NULL && ctx->timeout) { + ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t)); + if (ctx->event == NULL) { + goto failed; + } - ctx->event->handler = ngx_resolver_timeout_handler; - ctx->event->data = ctx; - ctx->event->log = r->log; - ctx->ident = -1; + ctx->event->handler = ngx_resolver_timeout_handler; + ctx->event->data = ctx; + ctx->event->log = r->log; + ctx->ident = -1; - ngx_add_timer(ctx->event, ctx->timeout); + ngx_add_timer(ctx->event, ctx->timeout); + } if (ngx_queue_empty(resend_queue)) { ngx_add_timer(r->event, (ngx_msec_t) (r->resend_timeout * 1000)); |