diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2011-12-14 14:31:55 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2011-12-14 14:31:55 +0000 |
| commit | aa96ac67fc96899551e555cdb616137525bbbb2e (patch) | |
| tree | 8ff364e620ff2b30437035c100b171f751b73089 /src/mail/ngx_mail_proxy_module.c | |
| parent | b527aea8d1aed60fea5ed3db0b28f8cf4df37841 (diff) | |
| download | nginx-aa96ac67fc96899551e555cdb616137525bbbb2e.tar.gz nginx-aa96ac67fc96899551e555cdb616137525bbbb2e.tar.bz2 | |
Merge of r4270, r4274:
Minor cleanup:
*) Changed error message to be more appropriate in the imaginary
"open_file_cache max=0" case.
*) Fixed NGX_CONF_TAKE1/NGX_CONF_FLAG misuse.
Diffstat (limited to 'src/mail/ngx_mail_proxy_module.c')
| -rw-r--r-- | src/mail/ngx_mail_proxy_module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mail/ngx_mail_proxy_module.c b/src/mail/ngx_mail_proxy_module.c index a7c4b7e48..298e8d96a 100644 --- a/src/mail/ngx_mail_proxy_module.c +++ b/src/mail/ngx_mail_proxy_module.c @@ -60,7 +60,7 @@ static ngx_command_t ngx_mail_proxy_commands[] = { NULL }, { ngx_string("proxy_pass_error_message"), - NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, + NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_FLAG, ngx_conf_set_flag_slot, NGX_MAIL_SRV_CONF_OFFSET, offsetof(ngx_mail_proxy_conf_t, pass_error_message), |