mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-12 13:42:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Igor Sysoev 2008-03-04 10:42:05 +00:00
parent 8efe926dc5
commit dfd5511f7a
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/ngx_resolver.c
View File

@ -92,27 +92,27 @@ static void *ngx_resolver_dup(ngx_resolver_t *r, void *src, size_t size);
/* STUB: ngx_peer_addr_t * */ /* STUB: ngx_peer_addr_t * */
ngx_resolver_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_resolver_t *r;
ngx_pool_cleanup_t *cln; ngx_pool_cleanup_t *cln;
ngx_udp_connection_t *uc; ngx_udp_connection_t *uc;
cln = ngx_pool_cleanup_add(pool, 0); cln = ngx_pool_cleanup_add(cf->pool, 0);
if (cln == NULL) { if (cln == NULL) {
return NULL; return NULL;
} }
cln->handler = ngx_resolver_cleanup; 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) { if (r == NULL) {
return NULL; return NULL;
} }
cln->data = r; 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) { if (r->event == NULL) {
return NULL; return NULL;
} }
@ -131,18 +131,18 @@ ngx_resolver_create(ngx_pool_t *pool, ngx_peer_addr_t *addr)
r->event->handler = ngx_resolver_resend_handler; r->event->handler = ngx_resolver_resend_handler;
r->event->data = r; r->event->data = r;
r->event->log = pool->log; r->event->log = cf->cycle->new_log;
r->ident = -1; r->ident = -1;
r->resend_timeout = 5; r->resend_timeout = 5;
r->expire = 30; r->expire = 30;
r->valid = 300; r->valid = 300;
r->log = pool->log; r->log = cf->cycle->new_log;
r->log_level = NGX_LOG_ALERT; r->log_level = NGX_LOG_ALERT;
if (addr) { 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) { if (uc == NULL) {
return NULL; return NULL;
} }
@ -152,7 +152,7 @@ ngx_resolver_create(ngx_pool_t *pool, ngx_peer_addr_t *addr)
uc->sockaddr = addr->sockaddr; uc->sockaddr = addr->sockaddr;
uc->socklen = addr->socklen; uc->socklen = addr->socklen;
uc->server = addr->name; uc->server = addr->name;
uc->log = pool->log; uc->log = cf->log;
} }
return r; return r;

2
src/core/ngx_resolver.h
View File

@ -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 *ngx_resolve_start(ngx_resolver_t *r,
ngx_resolver_ctx_t *temp); ngx_resolver_ctx_t *temp);
ngx_int_t ngx_resolve_name(ngx_resolver_ctx_t *ctx); ngx_int_t ngx_resolve_name(ngx_resolver_ctx_t *ctx);

4
src/http/ngx_http_core_module.c
View File

@ -2910,7 +2910,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
conf->resolver = prev->resolver; conf->resolver = prev->resolver;
if (conf->resolver == NULL) { if (conf->resolver == NULL) {
conf->resolver = ngx_resolver_create(cf->pool, NULL); conf->resolver = ngx_resolver_create(cf, NULL);
if (conf->resolver == NULL) { if (conf->resolver == NULL) {
return NGX_CONF_ERROR; 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; 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) { if (clcf->resolver == NULL) {
return NGX_OK; return NGX_OK;
} }

2
src/mail/ngx_mail_core_module.c
View File

@ -437,7 +437,7 @@ ngx_mail_core_resolver(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_ERROR; 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) { if (cscf->resolver == NULL) {
return NGX_CONF_OK; return NGX_CONF_OK;
} }