Mercurial > hg > nginx

comparison src/mail/ngx_mail_proxy_module.c @ 4357:efd515ace6bb stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 14 Dec 2011 14:31:55 +0000
parents dd1570b6f237
children d620f497c50f
comparison
equal deleted inserted replaced
4356:c8695c991cb8 4357:efd515ace6bb
58 NGX_MAIL_SRV_CONF_OFFSET, 58 NGX_MAIL_SRV_CONF_OFFSET,
59 offsetof(ngx_mail_proxy_conf_t, timeout), 59 offsetof(ngx_mail_proxy_conf_t, timeout),
60 NULL }, 60 NULL },
61 61
62 { ngx_string("proxy_pass_error_message"), 62 { ngx_string("proxy_pass_error_message"),
63 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, 63 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_FLAG,
64 ngx_conf_set_flag_slot, 64 ngx_conf_set_flag_slot,
65 NGX_MAIL_SRV_CONF_OFFSET, 65 NGX_MAIL_SRV_CONF_OFFSET,
66 offsetof(ngx_mail_proxy_conf_t, pass_error_message), 66 offsetof(ngx_mail_proxy_conf_t, pass_error_message),
67 NULL }, 67 NULL },
68 68