Mercurial > hg > nginx
changeset 4273:e444e8f6538b
Fixed NGX_CONF_TAKE1/NGX_CONF_FLAG misuse.
author | Sergey Budnevitch <sb@waeme.net> |
---|---|
date | Mon, 14 Nov 2011 09:12:15 +0000 |
parents | 260d591cb6a3 |
children | 595560d9dcbf |
files | src/http/modules/ngx_http_fastcgi_module.c src/http/modules/ngx_http_ssi_filter_module.c src/http/modules/ngx_http_ssl_module.c src/mail/ngx_mail_proxy_module.c |
diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_fastcgi_module.c Thu Nov 10 16:25:08 2011 +0000 +++ b/src/http/modules/ngx_http_fastcgi_module.c Mon Nov 14 09:12:15 2011 +0000 @@ -436,7 +436,7 @@ &ngx_http_upstream_ignore_headers_masks }, { ngx_string("fastcgi_catch_stderr"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_str_array_slot, NGX_HTTP_LOC_CONF_OFFSET, offsetof(ngx_http_fastcgi_loc_conf_t, catch_stderr),
--- a/src/http/modules/ngx_http_ssi_filter_module.c Thu Nov 10 16:25:08 2011 +0000 +++ b/src/http/modules/ngx_http_ssi_filter_module.c Mon Nov 14 09:12:15 2011 +0000 @@ -139,14 +139,14 @@ NULL }, { ngx_string("ssi_min_file_chunk"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_size_slot, NGX_HTTP_LOC_CONF_OFFSET, offsetof(ngx_http_ssi_loc_conf_t, min_file_chunk), NULL }, { ngx_string("ssi_value_length"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_size_slot, NGX_HTTP_LOC_CONF_OFFSET, offsetof(ngx_http_ssi_loc_conf_t, value_len),
--- a/src/http/modules/ngx_http_ssl_module.c Thu Nov 10 16:25:08 2011 +0000 +++ b/src/http/modules/ngx_http_ssl_module.c Mon Nov 14 09:12:15 2011 +0000 @@ -101,7 +101,7 @@ NULL }, { ngx_string("ssl_verify_client"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, ngx_conf_set_enum_slot, NGX_HTTP_SRV_CONF_OFFSET, offsetof(ngx_http_ssl_srv_conf_t, verify),
--- a/src/mail/ngx_mail_proxy_module.c Thu Nov 10 16:25:08 2011 +0000 +++ b/src/mail/ngx_mail_proxy_module.c Mon Nov 14 09:12:15 2011 +0000 @@ -60,7 +60,7 @@ 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),