Author: mdounin
Date: 2011-12-14 14:31:55 +0000 (Wed, 14 Dec 2011)
New Revision: 4358

Log:
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.


Modified:
branches/stable-1.0/
branches/stable-1.0/src/http/modules/ngx_http_fastcgi_module.c
branches/stable-1.0/src/http/modules/ngx_http_ssi_filter_module.c
branches/stable-1.0/src/http/modules/ngx_http_ssl_module.c
branches/stable-1.0/src/http/ngx_http_core_module.c
branches/stable-1.0/src/mail/ngx_mail_proxy_module.c


Property changes on: branches/stable-1.0
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4280,4283,4300-4301,4303-4304,4308-4309,4321,4342-4343
+ /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274,4280,4283,4300-4301,4303-4304,4308-4309,4321,4342-4343

Modified: branches/stable-1.0/src/http/modules/ngx_http_fastcgi_module.c
===================================================================
--- branches/stable-1.0/src/http/modules/ngx_http_fastcgi_module.c 2011-12-14 13:40:25 UTC (rev 4357)
+++ branches/stable-1.0/src/http/modules/ngx_http_fastcgi_module.c 2011-12-14 14:31:55 UTC (rev 4358)
@@ -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),

Modified: branches/stable-1.0/src/http/modules/ngx_http_ssi_filter_module.c
===================================================================
--- branches/stable-1.0/src/http/modules/ngx_http_ssi_filter_module.c 2011-12-14 13:40:25 UTC (rev 4357)
+++ branches/stable-1.0/src/http/modules/ngx_http_ssi_filter_module.c 2011-12-14 14:31:55 UTC (rev 4358)
@@ -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),

Modified: branches/stable-1.0/src/http/modules/ngx_http_ssl_module.c
===================================================================
--- branches/stable-1.0/src/http/modules/ngx_http_ssl_module.c 2011-12-14 13:40:25 UTC (rev 4357)
+++ branches/stable-1.0/src/http/modules/ngx_http_ssl_module.c 2011-12-14 14:31:55 UTC (rev 4358)
@@ -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),

Modified: branches/stable-1.0/src/http/ngx_http_core_module.c
===================================================================
--- branches/stable-1.0/src/http/ngx_http_core_module.c 2011-12-14 13:40:25 UTC (rev 4357)
+++ branches/stable-1.0/src/http/ngx_http_core_module.c 2011-12-14 14:31:55 UTC (rev 4358)
@@ -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;
}


Modified: branches/stable-1.0/src/mail/ngx_mail_proxy_module.c
===================================================================
--- branches/stable-1.0/src/mail/ngx_mail_proxy_module.c 2011-12-14 13:40:25 UTC (rev 4357)
+++ branches/stable-1.0/src/mail/ngx_mail_proxy_module.c 2011-12-14 14:31:55 UTC (rev 4358)
@@ -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),

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel