comparison src/mail/ngx_mail_proxy_module.c @ 3237:2efa8d2fcde1 stable-0.7

merge r2903, r2911, r2912, r3002: fix various failures handling
author Igor Sysoev <igor@sysoev.ru>
date Mon, 26 Oct 2009 15:54:29 +0000
parents 1ab9cef4ff6c
children f0d596e84634 d612c9374453
comparison
equal deleted inserted replaced
3236:9aa8fd2d5a00 3237:2efa8d2fcde1
1059 { 1059 {
1060 ngx_mail_proxy_conf_t *pcf; 1060 ngx_mail_proxy_conf_t *pcf;
1061 1061
1062 pcf = ngx_pcalloc(cf->pool, sizeof(ngx_mail_proxy_conf_t)); 1062 pcf = ngx_pcalloc(cf->pool, sizeof(ngx_mail_proxy_conf_t));
1063 if (pcf == NULL) { 1063 if (pcf == NULL) {
1064 return NGX_CONF_ERROR; 1064 return NULL;
1065 } 1065 }
1066 1066
1067 pcf->enable = NGX_CONF_UNSET; 1067 pcf->enable = NGX_CONF_UNSET;
1068 pcf->pass_error_message = NGX_CONF_UNSET; 1068 pcf->pass_error_message = NGX_CONF_UNSET;
1069 pcf->xclient = NGX_CONF_UNSET; 1069 pcf->xclient = NGX_CONF_UNSET;