From dfd5511f7aaada306577a28eb8f72c589b1d419d Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 4 Mar 2008 10:42:05 +0000 Subject: use cf->cycle->new_log because at merge stage cf->pool->log is old log --- src/http/ngx_http_core_module.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/http/ngx_http_core_module.c') diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index da273773b..1830295e2 100644 --- 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 *cf, void *parent, void *child) 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, ngx_command_t *cmd, void *conf) 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; } -- cgit