Mercurial > hg > nginx

diff src/http/ngx_http_core_module.c @ 1913:c0f873458e2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 4a8c9139e579
children 91879041b681
line wrap: on
line diff
--- 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;
     }