diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-11-07 14:24:55 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-11-07 14:24:55 +0000 |
| commit | 0302764c914d07ffe8f81b27fe4e1ce43b4c095e (patch) | |
| tree | 046927c7e3faeb3818e1c74993d5949c654dd689 /src/mail/ngx_mail.c | |
| parent | 3a79abf0ca5dca3720f4c08eb7d91a6f9b286dc3 (diff) | |
| download | nginx-0302764c914d07ffe8f81b27fe4e1ce43b4c095e.tar.gz nginx-0302764c914d07ffe8f81b27fe4e1ce43b4c095e.tar.bz2 | |
r1477, r1478, r1479, r1480, r1481, r1482, r1483, r1484, r1485, r1486,
r1487, r1488, r1494, r1495, r1499 merge:
*) ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
*) smtp_client_buffer and smtp_greeting_delay
Diffstat (limited to 'src/mail/ngx_mail.c')
| -rw-r--r-- | src/mail/ngx_mail.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mail/ngx_mail.c b/src/mail/ngx_mail.c index a39bec4a4..95d29e893 100644 --- a/src/mail/ngx_mail.c +++ b/src/mail/ngx_mail.c @@ -185,6 +185,8 @@ ngx_mail_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) /* 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_command_t *cmd, void *conf) /* 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_command_t *cmd, void *conf) } } - /* mail{}'s cf->ctx was needed while the configuration merging */ - *cf = pcf; |