[nginx] svn commit: r4274 - in trunk/src: http/modules mail

[sb at waeme.net]

Author: fabler
Date: 2011-11-14 09:12:15 +0000 (Mon, 14 Nov 2011)
New Revision: 4274

Log:
Fixed NGX_CONF_TAKE1/NGX_CONF_FLAG misuse.


Modified:
   trunk/src/http/modules/ngx_http_fastcgi_module.c
   trunk/src/http/modules/ngx_http_ssi_filter_module.c
   trunk/src/http/modules/ngx_http_ssl_module.c
   trunk/src/mail/ngx_mail_proxy_module.c

Modified: trunk/src/http/modules/ngx_http_fastcgi_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_fastcgi_module.c	2011-11-10 16:25:08 UTC (rev 4273)
+++ trunk/src/http/modules/ngx_http_fastcgi_module.c	2011-11-14 09:12:15 UTC (rev 4274)
@@ -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),

Modified: trunk/src/http/modules/ngx_http_ssi_filter_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_ssi_filter_module.c	2011-11-10 16:25:08 UTC (rev 4273)
+++ trunk/src/http/modules/ngx_http_ssi_filter_module.c	2011-11-14 09:12:15 UTC (rev 4274)
@@ -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: trunk/src/http/modules/ngx_http_ssl_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_ssl_module.c	2011-11-10 16:25:08 UTC (rev 4273)
+++ trunk/src/http/modules/ngx_http_ssl_module.c	2011-11-14 09:12:15 UTC (rev 4274)
@@ -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: trunk/src/mail/ngx_mail_proxy_module.c
===================================================================
--- trunk/src/mail/ngx_mail_proxy_module.c	2011-11-10 16:25:08 UTC (rev 4273)
+++ trunk/src/mail/ngx_mail_proxy_module.c	2011-11-14 09:12:15 UTC (rev 4274)
@@ -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),