commit dfd5511f7aaada306577a28eb8f72c589b1d419d
author Igor Sysoev <igor@sysoev.ru> Tue Mar 04 10:42:05 2008 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Mar 04 10:42:05 2008 +0000
tree 84faf307b8eea422c3adf7008146b0d380929b3f
parent 8efe926dc5601397bc054aedf37594e9719a52f6

use cf->cycle->new_log because at merge stage cf->pool->log is old log

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 da27377..1830295 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2910,7 +2910,7 @@
         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 @@
         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;
     }