Mercurial > hg > nginx
diff src/mail/ngx_mail_core_module.c @ 1896:4c060e30476b
do not resolve SMTP clients by default
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sat, 16 Feb 2008 13:46:33 +0000 |
parents | 057d362ee50e |
children | 4a8c9139e579 |
line wrap: on
line diff
--- a/src/mail/ngx_mail_core_module.c Fri Feb 15 13:57:55 2008 +0000 +++ b/src/mail/ngx_mail_core_module.c Sat Feb 16 13:46:33 2008 +0000 @@ -154,13 +154,14 @@ * set by ngx_pcalloc(): * * cscf->protocol = NULL; - * cscf->resolver = NULL; */ cscf->timeout = NGX_CONF_UNSET_MSEC; cscf->resolver_timeout = NGX_CONF_UNSET_MSEC; cscf->so_keepalive = NGX_CONF_UNSET; + cscf->resolver = NGX_CONF_UNSET_PTR; + cscf->file_name = cf->conf_file->file.name.data; cscf->line = cf->conf_file->line; @@ -207,9 +208,7 @@ return NGX_CONF_ERROR; } - if (conf->resolver == NULL) { - conf->resolver = prev->resolver; - } + ngx_conf_merge_ptr_value(conf->resolver, prev->resolver, NULL); return NGX_CONF_OK; } @@ -423,6 +422,11 @@ value = cf->args->elts; + if (ngx_strcmp(value[1].data, "off") == 0) { + cscf->resolver = NULL; + return NGX_CONF_OK; + } + ngx_memzero(&u, sizeof(ngx_url_t)); u.host = value[1]; @@ -435,7 +439,7 @@ cscf->resolver = ngx_resolver_create(&u.addrs[0], cf->cycle->new_log); if (cscf->resolver == NULL) { - return NGX_OK; + return NGX_CONF_OK; } return NGX_CONF_OK;