summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2016-02-04 18:30:21 +0300
committerMaxim Dounin <mdounin@mdounin.ru>2016-02-04 18:30:21 +0300
commit359803e457b85fd931f182bcdab6eaf953426449 (patch)
treee688488531c4573f0bf2011587693903c6546f08
parent86cc342a26af3aa677d9770dc6a9bcdbd07f5a9e (diff)
downloadnginx-359803e457b85fd931f182bcdab6eaf953426449.tar.gz
nginx-359803e457b85fd931f182bcdab6eaf953426449.tar.bz2
Dynamic modules: introduced HTTP_INIT_FILTER_MODULES.
Additionally, HTTP_HEADERS_FILTER_MODULE now added to HTTP_FILTER_MODULES. This avoids explict use of modules at the later stages, now only module lists are used. This will be needed in later patches.
-rw-r--r--auto/modules18
1 files changed, 10 insertions, 8 deletions
diff --git a/auto/modules b/auto/modules
index b2d2ee48a..8e2f43bbd 100644
--- a/auto/modules
+++ b/auto/modules
@@ -185,10 +185,17 @@ if [ $HTTP_USERID = YES ]; then
HTTP_SRCS="$HTTP_SRCS $HTTP_USERID_SRCS"
fi
+HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_HEADERS_FILTER_MODULE"
+
+
+HTTP_INIT_FILTER_MODULES="$HTTP_COPY_FILTER_MODULE \
+ $HTTP_RANGE_BODY_FILTER_MODULE \
+ $HTTP_NOT_MODIFIED_FILTER_MODULE"
+
if [ $HTTP_SLICE = YES ]; then
HTTP_SRCS="$HTTP_SRCS $HTTP_SLICE_SRCS"
-else
- HTTP_SLICE_FILTER_MODULE=""
+ HTTP_INIT_FILTER_MODULES="$HTTP_INIT_FILTER_MODULES \
+ $HTTP_SLICE_FILTER_MODULE"
fi
@@ -469,12 +476,7 @@ fi
if [ $HTTP = YES ]; then
modules="$modules $HTTP_MODULES $HTTP_FILTER_MODULES \
- $HTTP_HEADERS_FILTER_MODULE \
- $HTTP_AUX_FILTER_MODULES \
- $HTTP_COPY_FILTER_MODULE \
- $HTTP_RANGE_BODY_FILTER_MODULE \
- $HTTP_NOT_MODIFIED_FILTER_MODULE \
- $HTTP_SLICE_FILTER_MODULE"
+ $HTTP_AUX_FILTER_MODULES $HTTP_INIT_FILTER_MODULES"
NGX_ADDON_DEPS="$NGX_ADDON_DEPS \$(HTTP_DEPS)"
fi