cleanup resolver

This commit is contained in:
Igor Sysoev
2008-02-28 20:38:34 +00:00
parent 02aa53be83
commit 4491daef30
4 changed files with 83 additions and 11 deletions

View File

@@ -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(NULL, cf->cycle->new_log);
conf->resolver = ngx_resolver_create(cf->pool, 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(&u.addrs[0], cf->cycle->new_log);
clcf->resolver = ngx_resolver_create(cf->pool, &u.addrs[0]);
if (clcf->resolver == NULL) {
return NGX_OK;
}