From 4d0ec88dff5476153c849f004730e8765c67af51 Mon Sep 17 00:00:00 2001
From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Wed, 23 Apr 2025 18:11:04 -0700
Subject: [PATCH] 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.
---
 auto/module | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/auto/module b/auto/module
index 3857d04ca..343f6357c 100644
--- a/auto/module
+++ b/auto/module
@@ -127,8 +127,39 @@ elif [ "$ngx_module_link" = YES ]; then
 
 elif [ "$ngx_module_link" = ADDON ]; then
 
-    eval ${ngx_module_type}_MODULES=\"\$${ngx_module_type}_MODULES \
-                                      $ngx_module_name\"
+    if [ -n "$ngx_module_order" -a \
+         \( "$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=
     for src in $ngx_module_srcs