bugfix: fixed compatibility issues with other nginx modules loaded as "dynamic modules" in NGINX 1.9.11+.

Author: agentzh

src/ngx_http_lua_initworkerby.c

@@ -26,6 +26,7 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
     ngx_uint_t                   i;
     ngx_conf_t                   conf;
     ngx_cycle_t                 *fake_cycle;
+    ngx_module_t               **modules;
     ngx_open_file_t             *file, *ofile;
     ngx_list_part_t             *part;
     ngx_connection_t            *c = NULL;
@@ -154,20 +155,26 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
         return NGX_ERROR;
     }
 
-    for (i = 0; ngx_modules[i]; i++) {
-        if (ngx_modules[i]->type != NGX_HTTP_MODULE) {
+#if defined(nginx_version) && nginx_version >= 1009011
+    modules = cycle->modules;
+#else
+    modules = ngx_modules;
+#endif
+
+    for (i = 0; modules[i]; i++) {
+        if (modules[i]->type != NGX_HTTP_MODULE) {
             continue;
         }
 
-        module = ngx_modules[i]->ctx;
+        module = modules[i]->ctx;
 
         if (module->create_srv_conf) {
             cur = module->create_srv_conf(&conf);
             if (cur == NULL) {
                 return NGX_ERROR;
             }
 
-            http_ctx.srv_conf[ngx_modules[i]->ctx_index] = cur;
+            http_ctx.srv_conf[modules[i]->ctx_index] = cur;
 
             if (module->merge_srv_conf) {
                 prev = module->create_srv_conf(&conf);
@@ -188,7 +195,7 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
                 return NGX_ERROR;
             }
 
-            http_ctx.loc_conf[ngx_modules[i]->ctx_index] = cur;
+            http_ctx.loc_conf[modules[i]->ctx_index] = cur;
 
             if (module->merge_loc_conf) {
                 prev = module->create_loc_conf(&conf);

src/ngx_http_lua_ndk.c

@@ -116,15 +116,22 @@ ngx_http_lookup_ndk_set_var_directive(u_char *name,
     ndk_set_var_t           *filter;
     ngx_uint_t               i;
     ngx_module_t            *module;
+    ngx_module_t           **modules;
     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;
         }