Mercurial > hg > nginx-quic
changeset 1913:c0f873458e2b
use cf->cycle->new_log because at merge stage cf->pool->log is old log
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 04 Mar 2008 10:42:05 +0000 |
parents | 68b426b43c31 |
children | d02fb350d17d |
files | src/core/ngx_resolver.c src/core/ngx_resolver.h src/http/ngx_http_core_module.c src/mail/ngx_mail_core_module.c |
diffstat | 4 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c @@ -92,27 +92,27 @@ static void *ngx_resolver_dup(ngx_resolv /* STUB: ngx_peer_addr_t * */ ngx_resolver_t * -ngx_resolver_create(ngx_pool_t *pool, ngx_peer_addr_t *addr) +ngx_resolver_create(ngx_conf_t *cf, ngx_peer_addr_t *addr) { ngx_resolver_t *r; ngx_pool_cleanup_t *cln; ngx_udp_connection_t *uc; - cln = ngx_pool_cleanup_add(pool, 0); + cln = ngx_pool_cleanup_add(cf->pool, 0); if (cln == NULL) { return NULL; } cln->handler = ngx_resolver_cleanup; - r = ngx_calloc(sizeof(ngx_resolver_t), pool->log); + r = ngx_calloc(sizeof(ngx_resolver_t), cf->log); if (r == NULL) { return NULL; } cln->data = r; - r->event = ngx_calloc(sizeof(ngx_event_t), pool->log); + r->event = ngx_calloc(sizeof(ngx_event_t), cf->log); if (r->event == NULL) { return NULL; } @@ -131,18 +131,18 @@ ngx_resolver_create(ngx_pool_t *pool, ng r->event->handler = ngx_resolver_resend_handler; r->event->data = r; - r->event->log = pool->log; + r->event->log = cf->cycle->new_log; r->ident = -1; r->resend_timeout = 5; r->expire = 30; r->valid = 300; - r->log = pool->log; + r->log = cf->cycle->new_log; r->log_level = NGX_LOG_ALERT; if (addr) { - uc = ngx_calloc(sizeof(ngx_udp_connection_t), pool->log); + uc = ngx_calloc(sizeof(ngx_udp_connection_t), cf->log); if (uc == NULL) { return NULL; } @@ -152,7 +152,7 @@ ngx_resolver_create(ngx_pool_t *pool, ng uc->sockaddr = addr->sockaddr; uc->socklen = addr->socklen; uc->server = addr->name; - uc->log = pool->log; + uc->log = cf->log; } return r;
--- a/src/core/ngx_resolver.h +++ b/src/core/ngx_resolver.h @@ -131,7 +131,7 @@ struct ngx_resolver_ctx_s { }; -ngx_resolver_t *ngx_resolver_create(ngx_pool_t *pool, ngx_peer_addr_t *addr); +ngx_resolver_t *ngx_resolver_create(ngx_conf_t *cf, ngx_peer_addr_t *addr); ngx_resolver_ctx_t *ngx_resolve_start(ngx_resolver_t *r, ngx_resolver_ctx_t *temp); ngx_int_t ngx_resolve_name(ngx_resolver_ctx_t *ctx);
--- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -2910,7 +2910,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t conf->resolver = prev->resolver; if (conf->resolver == NULL) { - conf->resolver = ngx_resolver_create(cf->pool, NULL); + conf->resolver = ngx_resolver_create(cf, NULL); if (conf->resolver == NULL) { return NGX_CONF_ERROR; } @@ -3728,7 +3728,7 @@ ngx_http_core_resolver(ngx_conf_t *cf, n return NGX_CONF_ERROR; } - clcf->resolver = ngx_resolver_create(cf->pool, &u.addrs[0]); + clcf->resolver = ngx_resolver_create(cf, &u.addrs[0]); if (clcf->resolver == NULL) { return NGX_OK; }
--- a/src/mail/ngx_mail_core_module.c +++ b/src/mail/ngx_mail_core_module.c @@ -437,7 +437,7 @@ ngx_mail_core_resolver(ngx_conf_t *cf, n return NGX_CONF_ERROR; } - cscf->resolver = ngx_resolver_create(cf->pool, &u.addrs[0]); + cscf->resolver = ngx_resolver_create(cf, &u.addrs[0]); if (cscf->resolver == NULL) { return NGX_CONF_OK; }