Mercurial > hg > nginx
comparison src/mail/ngx_mail_core_module.c @ 1913:c0f873458e2b
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 | a47516c7065b |
comparison
equal
deleted
inserted
replaced
1912:68b426b43c31 | 1913:c0f873458e2b |
---|---|
435 if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) { | 435 if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) { |
436 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V: %s", &u.host, u.err); | 436 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V: %s", &u.host, u.err); |
437 return NGX_CONF_ERROR; | 437 return NGX_CONF_ERROR; |
438 } | 438 } |
439 | 439 |
440 cscf->resolver = ngx_resolver_create(cf->pool, &u.addrs[0]); | 440 cscf->resolver = ngx_resolver_create(cf, &u.addrs[0]); |
441 if (cscf->resolver == NULL) { | 441 if (cscf->resolver == NULL) { |
442 return NGX_CONF_OK; | 442 return NGX_CONF_OK; |
443 } | 443 } |
444 | 444 |
445 return NGX_CONF_OK; | 445 return NGX_CONF_OK; |