]> git.kaiwu.me - nginx.git/commitdiff
change ngx_http_ssi_filter and ngx_http_charset_filter order
authorIgor Sysoev <igor@sysoev.ru>
Thu, 1 Apr 2010 10:19:02 +0000 (10:19 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Thu, 1 Apr 2010 10:19:02 +0000 (10:19 +0000)
auto/modules

index 5582c2ce6e0eeeb25917483885c5d34f1c3802e7..20bee18d028a0d96f66afa9c855f8a9fe46f9c05 100644 (file)
@@ -102,8 +102,8 @@ fi
 #     ngx_http_range_header_filter
 #     ngx_http_gzip_filter
 #     ngx_http_postpone_filter
-#     ngx_http_charset_filter
 #     ngx_http_ssi_filter
+#     ngx_http_charset_filter
 #         ngx_http_xslt_filter
 #         ngx_http_image_filter
 #         ngx_http_sub_filter
@@ -131,12 +131,6 @@ if [ $HTTP_POSTPONE = YES ]; then
     HTTP_SRCS="$HTTP_SRCS $HTTP_POSTPONE_FILTER_SRCS"
 fi
 
-if [ $HTTP_CHARSET = YES ]; then
-    have=NGX_HTTP_CHARSET . auto/have
-    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_CHARSET_FILTER_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_CHARSET_SRCS"
-fi
-
 if [ $HTTP_SSI = YES ]; then
     have=NGX_HTTP_SSI . auto/have
     HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SSI_FILTER_MODULE"
@@ -144,6 +138,12 @@ if [ $HTTP_SSI = YES ]; then
     HTTP_SRCS="$HTTP_SRCS $HTTP_SSI_SRCS"
 fi
 
+if [ $HTTP_CHARSET = YES ]; then
+    have=NGX_HTTP_CHARSET . auto/have
+    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_CHARSET_FILTER_MODULE"
+    HTTP_SRCS="$HTTP_SRCS $HTTP_CHARSET_SRCS"
+fi
+
 if [ $HTTP_XSLT = YES ]; then
     USE_LIBXSLT=YES
     HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_XSLT_FILTER_MODULE"