Mercurial > hg > nginx
diff src/mail/ngx_mail.c @ 1487:f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sat, 15 Sep 2007 16:51:16 +0000 |
parents | 0d57c150115b |
children | cb8c0c8e0c27 |
line wrap: on
line diff
--- a/src/mail/ngx_mail.c +++ b/src/mail/ngx_mail.c @@ -185,6 +185,8 @@ ngx_mail_block(ngx_conf_t *cf, ngx_comma /* init mail{} main_conf's */ + cf->ctx = ctx; + if (module->init_main_conf) { rv = module->init_main_conf(cf, ctx->main_conf[mi]); if (rv != NGX_CONF_OK) { @@ -197,6 +199,8 @@ ngx_mail_block(ngx_conf_t *cf, ngx_comma /* merge the server{}s' srv_conf's */ + cf->ctx = cscfp[s]->ctx; + if (module->merge_srv_conf) { rv = module->merge_srv_conf(cf, ctx->srv_conf[mi], @@ -209,8 +213,6 @@ ngx_mail_block(ngx_conf_t *cf, ngx_comma } } - /* mail{}'s cf->ctx was needed while the configuration merging */ - *cf = pcf;