summaryrefslogtreecommitdiffhomepage
path: root/auto/modules
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--auto/modules23
1 files changed, 14 insertions, 9 deletions
diff --git a/auto/modules b/auto/modules
index 68d6eed05..a2dccc88e 100644
--- a/auto/modules
+++ b/auto/modules
@@ -43,16 +43,12 @@ fi
HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES \
$HTTP_CHUNKED_FILTER_MODULE \
- $HTTP_RANGE_HEADER_FILTER_MODULE \
- $HTTP_CHARSET_FILTER_MODULE"
+ $HTTP_RANGE_HEADER_FILTER_MODULE"
-HTTP_MODULES="$HTTP_MODULES $HTTP_STATIC_MODULE $HTTP_INDEX_MODULE"
-
-if [ $HTTP_REWRITE = YES -a $USE_PCRE != DISABLED ]; then
- have=NGX_HTTP_REWRITE . auto/have
- USE_PCRE=YES
- HTTP_MODULES="$HTTP_MODULES $HTTP_REWRITE_MODULE"
- HTTP_SRCS="$HTTP_SRCS $HTTP_REWRITE_SRCS"
+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_GZIP = YES ]; then
@@ -68,6 +64,15 @@ if [ $HTTP_SSI = YES ]; then
HTTP_SRCS="$HTTP_SRCS $HTTP_SSI_SRCS"
fi
+HTTP_MODULES="$HTTP_MODULES $HTTP_STATIC_MODULE $HTTP_INDEX_MODULE"
+
+if [ $HTTP_REWRITE = YES -a $USE_PCRE != DISABLED ]; then
+ have=NGX_HTTP_REWRITE . auto/have
+ USE_PCRE=YES
+ HTTP_MODULES="$HTTP_MODULES $HTTP_REWRITE_MODULE"
+ HTTP_SRCS="$HTTP_SRCS $HTTP_REWRITE_SRCS"
+fi
+
if [ $HTTP_PROXY = YES ]; then
have=NGX_HTTP_PROXY . auto/have
USE_MD5=YES