feature: this module can now be compiled as a dynamic module with NGINX 1.9.11+ via the --with-dynamic-module=PATH option of ./configure. also fixed issues with other modules are compiled as dynamic modules.

agentzh · agentzh · commit d15338e4cdcb · 2016-02-29T21:57:10.000-08:00
diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@ Table of Contents
     * [array_map](#array_map)
     * [array_map_op](#array_map_op)
 * [Installation](#installation)
+    * [Building as a dynamic module](#building-as-a-dynamic-module)
 * [Compatibility](#compatibility)
 * [Source Repository](#source-repository)
 * [Getting involved](#getting-involved)
@@ -284,6 +285,20 @@ Also, this module is included and enabled by default in the [OpenResty bundle](h
 
 [Back to TOC](#table-of-contents)
 
+Building as a dynamic module
+----------------------------
+
+Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
+`./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
+directive, for example,
+
+```nginx
+load_module /path/to/modules/ndk_http_module.so;  # assuming NDK is built as a dynamic module too
+load_module /path/to/modules/ngx_http_array_var_module.so;
+```
+
+[Back to TOC](#table-of-contents)
+
 Compatibility
 ==============
 
diff --git a/config b/config
@@ -1,13 +1,44 @@
-if echo $HTTP_MODULES | grep " ndk_http_module" > /dev/null; then
-    echo "found ngx_devel_kit for ngx_array_var; looks good."
+if test -n "$ngx_module_link"; then
+    if test -n "$NDK_SRCS"; then
+        echo "found ngx_devel_kit for ngx_array_var; looks good."
+    else
+        echo "error: ngx_devel_kit is required to build ngx_array_var; please put it before ngx_array_var." 1>&2
+        exit 1
+    fi
 else
-    echo "error: ngx_devel_kit is required to build ngx_array_var; please put it before ngx_array_var." 1>&2
-    exit 1
+    if echo $HTTP_MODULES | grep " ndk_http_module" > /dev/null; then
+        echo "found ngx_devel_kit for ngx_array_var; looks good."
+    else
+        echo "error: ngx_devel_kit is required to build ngx_array_var; please put it before ngx_array_var." 1>&2
+        exit 1
+    fi
 fi
 
 ngx_addon_name=ngx_http_array_var_module
-HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_array_var_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_array_var_module.c $ngx_addon_dir/src/ngx_http_array_var_util.c"
-NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/ngx_http_array_var_util.h"
-CFLAGS="$CFLAGS -DNDK_SET_VAR"
 
+HTTP_ARRAY_VAR_SRCS="                                                       \
+                    $ngx_addon_dir/src/ngx_http_array_var_module.c          \
+                    $ngx_addon_dir/src/ngx_http_array_var_util.c            \
+                    "
+
+HTTP_ARRAY_VAR_DEPS="                                                       \
+                    $ngx_addon_dir/src/ddebug.h                             \
+                    $ngx_addon_dir/src/ngx_http_array_var_util.h            \
+                    "
+
+if test -n "$ngx_module_link"; then
+    ngx_module_type=HTTP
+    ngx_module_name=$ngx_addon_name
+    ngx_module_incs=
+    ngx_module_deps="$HTTP_ARRAY_VAR_DEPS"
+    ngx_module_srcs="$HTTP_ARRAY_VAR_SRCS"
+    ngx_module_libs=
+
+    . auto/module
+else
+    HTTP_MODULES="$HTTP_MODULES $ngx_addon_name"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $HTTP_ARRAY_VAR_SRCS"
+    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $HTTP_ARRAY_VAR_DEPS"
+fi
+
+CFLAGS="$CFLAGS -DNDK_SET_VAR"
diff --git a/src/ngx_http_array_var_util.c b/src/ngx_http_array_var_util.c
@@ -48,16 +48,23 @@ ngx_http_array_var_get_func_from_cmd(u_char *name, size_t name_len)
 {
     ndk_set_var_t           *filter;
     ngx_uint_t               i;
+    ngx_module_t           **modules;
     ngx_module_t            *module;
     ngx_command_t           *cmd;
 
-    for (i = 0; ngx_modules[i]; i++) {
-        module = ngx_modules[i];
+#if defined(nginx_version) && nginx_version >= 1009011
+    modules = ngx_cycle->modules;
+#else
+    modules = ngx_modules;
+#endif
+
+    for (i = 0; modules[i]; i++) {
+        module = modules[i];
         if (module->type != NGX_HTTP_MODULE) {
             continue;
         }
 
-        cmd = ngx_modules[i]->commands;
+        cmd = modules[i]->commands;
         if (cmd == NULL) {
             continue;
         }
