Commit dfd5511f7aaada306577a28eb8f72c589b1d419d - nginx

use cf->cycle->new_log because at merge stage cf->pool->log is old log Igor Sysoev 14 years ago

4 changed file(s) with 12 addition(s) and 12 deletion(s). Raw diff Collapse all Expand all

-8

src/core/ngx_resolver.c less more

91	91	/* STUB: ngx_peer_addr_t * */
92	92
93	93	ngx_resolver_t *
94		ngx_resolver_create(ngx_pool_t pool, ngx_peer_addr_t addr)
	94	ngx_resolver_create(ngx_conf_t cf, ngx_peer_addr_t addr)
95	95	{
96	96	ngx_resolver_t *r;
97	97	ngx_pool_cleanup_t *cln;
98	98	ngx_udp_connection_t *uc;
99	99
100		cln = ngx_pool_cleanup_add(pool, 0);
	100	cln = ngx_pool_cleanup_add(cf->pool, 0);
101	101	if (cln == NULL) {
102	102	return NULL;
103	103	}
104	104
105	105	cln->handler = ngx_resolver_cleanup;
106	106
107		r = ngx_calloc(sizeof(ngx_resolver_t), pool->log);
	107	r = ngx_calloc(sizeof(ngx_resolver_t), cf->log);
108	108	if (r == NULL) {
109	109	return NULL;
110	110	}
111	111
112	112	cln->data = r;
113	113
114		r->event = ngx_calloc(sizeof(ngx_event_t), pool->log);
	114	r->event = ngx_calloc(sizeof(ngx_event_t), cf->log);
115	115	if (r->event == NULL) {
116	116	return NULL;
117	117	}

130	130
131	131	r->event->handler = ngx_resolver_resend_handler;
132	132	r->event->data = r;
133		r->event->log = pool->log;
	133	r->event->log = cf->cycle->new_log;
134	134	r->ident = -1;
135	135
136	136	r->resend_timeout = 5;
137	137	r->expire = 30;
138	138	r->valid = 300;
139	139
140		r->log = pool->log;
	140	r->log = cf->cycle->new_log;
141	141	r->log_level = NGX_LOG_ALERT;
142	142
143	143	if (addr) {
144		uc = ngx_calloc(sizeof(ngx_udp_connection_t), pool->log);
	144	uc = ngx_calloc(sizeof(ngx_udp_connection_t), cf->log);
145	145	if (uc == NULL) {
146	146	return NULL;
147	147	}

151	151	uc->sockaddr = addr->sockaddr;
152	152	uc->socklen = addr->socklen;
153	153	uc->server = addr->name;
154		uc->log = pool->log;
	154	uc->log = cf->log;
155	155	}
156	156
157	157	return r;

-1

src/core/ngx_resolver.h less more

130	130	};
131	131
132	132
133		ngx_resolver_t ngx_resolver_create(ngx_pool_t pool, ngx_peer_addr_t *addr);
	133	ngx_resolver_t ngx_resolver_create(ngx_conf_t cf, ngx_peer_addr_t *addr);
134	134	ngx_resolver_ctx_t ngx_resolve_start(ngx_resolver_t r,
135	135	ngx_resolver_ctx_t *temp);
136	136	ngx_int_t ngx_resolve_name(ngx_resolver_ctx_t *ctx);

-2

src/http/ngx_http_core_module.c less more

2909	2909	conf->resolver = prev->resolver;
2910	2910
2911	2911	if (conf->resolver == NULL) {
2912		conf->resolver = ngx_resolver_create(cf->pool, NULL);
	2912	conf->resolver = ngx_resolver_create(cf, NULL);
2913	2913	if (conf->resolver == NULL) {
2914	2914	return NGX_CONF_ERROR;
2915	2915	}

3727	3727	return NGX_CONF_ERROR;
3728	3728	}
3729	3729
3730		clcf->resolver = ngx_resolver_create(cf->pool, &u.addrs[0]);
	3730	clcf->resolver = ngx_resolver_create(cf, &u.addrs[0]);
3731	3731	if (clcf->resolver == NULL) {
3732	3732	return NGX_OK;
3733	3733	}

-1

src/mail/ngx_mail_core_module.c less more

436	436	return NGX_CONF_ERROR;
437	437	}
438	438
439		cscf->resolver = ngx_resolver_create(cf->pool, &u.addrs[0]);
	439	cscf->resolver = ngx_resolver_create(cf, &u.addrs[0]);
440	440	if (cscf->resolver == NULL) {
441	441	return NGX_CONF_OK;
442	442	}