Configure: honor $ngx_module_order for ADDON modules.

Previously, $ngx_module_order was respected only for DYNAMIC modules.
The fix is to make the filters order the same regardless of module
linking type.
This commit is contained in:
Dmitry Volyntsev 2025-04-23 18:11:04 -07:00
parent 9785db9bd5
commit 4d0ec88dff

View File

@ -127,8 +127,39 @@ elif [ "$ngx_module_link" = YES ]; then
elif [ "$ngx_module_link" = ADDON ]; then elif [ "$ngx_module_link" = ADDON ]; then
eval ${ngx_module_type}_MODULES=\"\$${ngx_module_type}_MODULES \ if [ -n "$ngx_module_order" -a \
$ngx_module_name\" \( "$ngx_module_type" = "HTTP_FILTER" \
-o "$ngx_module_type" = "HTTP_AUX_FILTER" \) ]
then
before=
found=no
for mod in $ngx_module_order; do
if [ "$found" = yes ]; then
before="$mod"
break
fi
if [ "$mod" = "$ngx_module_name" ]; then
found=yes
fi
done
vname="${ngx_module_type}_MODULES"
eval modules=\$$vname
new_modules=
for mod in $modules; do
if [ "$mod" = "$before" ]; then
new_modules="$new_modules $ngx_module_name"
fi
new_modules="$new_modules $mod"
done
eval ${ngx_module_type}_MODULES=\"$new_modules\"
else
eval ${ngx_module_type}_MODULES=\"\$${ngx_module_type}_MODULES \
$ngx_module_name\"
fi
srcs= srcs=
for src in $ngx_module_srcs for src in $ngx_module_srcs