comparison auto/modules @ 6381:c529555949b7

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.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 04 Feb 2016 18:30:21 +0300
parents 29f35e60840b
children 392959224560
comparison
equal deleted inserted replaced
6380:7142b04337d6 6381:c529555949b7
183 if [ $HTTP_USERID = YES ]; then 183 if [ $HTTP_USERID = YES ]; then
184 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_USERID_FILTER_MODULE" 184 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_USERID_FILTER_MODULE"
185 HTTP_SRCS="$HTTP_SRCS $HTTP_USERID_SRCS" 185 HTTP_SRCS="$HTTP_SRCS $HTTP_USERID_SRCS"
186 fi 186 fi
187 187
188 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_HEADERS_FILTER_MODULE"
189
190
191 HTTP_INIT_FILTER_MODULES="$HTTP_COPY_FILTER_MODULE \
192 $HTTP_RANGE_BODY_FILTER_MODULE \
193 $HTTP_NOT_MODIFIED_FILTER_MODULE"
194
188 if [ $HTTP_SLICE = YES ]; then 195 if [ $HTTP_SLICE = YES ]; then
189 HTTP_SRCS="$HTTP_SRCS $HTTP_SLICE_SRCS" 196 HTTP_SRCS="$HTTP_SRCS $HTTP_SLICE_SRCS"
190 else 197 HTTP_INIT_FILTER_MODULES="$HTTP_INIT_FILTER_MODULES \
191 HTTP_SLICE_FILTER_MODULE="" 198 $HTTP_SLICE_FILTER_MODULE"
192 fi 199 fi
193 200
194 201
195 if [ $HTTP_V2 = YES ]; then 202 if [ $HTTP_V2 = YES ]; then
196 have=NGX_HTTP_V2 . auto/have 203 have=NGX_HTTP_V2 . auto/have
467 CORE_SRCS="$CORE_SRCS $REGEX_SRCS" 474 CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
468 fi 475 fi
469 476
470 if [ $HTTP = YES ]; then 477 if [ $HTTP = YES ]; then
471 modules="$modules $HTTP_MODULES $HTTP_FILTER_MODULES \ 478 modules="$modules $HTTP_MODULES $HTTP_FILTER_MODULES \
472 $HTTP_HEADERS_FILTER_MODULE \ 479 $HTTP_AUX_FILTER_MODULES $HTTP_INIT_FILTER_MODULES"
473 $HTTP_AUX_FILTER_MODULES \
474 $HTTP_COPY_FILTER_MODULE \
475 $HTTP_RANGE_BODY_FILTER_MODULE \
476 $HTTP_NOT_MODIFIED_FILTER_MODULE \
477 $HTTP_SLICE_FILTER_MODULE"
478 480
479 NGX_ADDON_DEPS="$NGX_ADDON_DEPS \$(HTTP_DEPS)" 481 NGX_ADDON_DEPS="$NGX_ADDON_DEPS \$(HTTP_DEPS)"
480 fi 482 fi
481 483
482 484