Mercurial > hg > nginx
changeset 4357:efd515ace6bb stable-1.0
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 | c8695c991cb8 |
children | 94b995c7c614 |
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/http/ngx_http_core_module.c src/mail/ngx_mail_proxy_module.c |
diffstat | 5 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_fastcgi_module.c Wed Dec 14 13:40:25 2011 +0000 +++ b/src/http/modules/ngx_http_fastcgi_module.c Wed Dec 14 14:31:55 2011 +0000 @@ -431,7 +431,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 Wed Dec 14 13:40:25 2011 +0000 +++ b/src/http/modules/ngx_http_ssi_filter_module.c Wed Dec 14 14:31:55 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 Wed Dec 14 13:40:25 2011 +0000 +++ b/src/http/modules/ngx_http_ssl_module.c Wed Dec 14 14:31:55 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/http/ngx_http_core_module.c Wed Dec 14 13:40:25 2011 +0000 +++ b/src/http/ngx_http_core_module.c Wed Dec 14 14:31:55 2011 +0000 @@ -4397,7 +4397,7 @@ if (ngx_strncmp(value[i].data, "max=", 4) == 0) { max = ngx_atoi(value[i].data + 4, value[i].len - 4); - if (max == NGX_ERROR) { + if (max <= 0) { goto failed; }
--- a/src/mail/ngx_mail_proxy_module.c Wed Dec 14 13:40:25 2011 +0000 +++ b/src/mail/ngx_mail_proxy_module.c Wed Dec 14 14:31:55 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),