From: Christophe Jaillet <jailletc36@apache.org>
Date: Fri, 13 May 2022 17:05:31 +0000 (+0000)
Subject: Merge r1898453 from trunk
X-Git-Tag: 2.4.54-rc1-candidate~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adf8d6c461820ce14ce88226d96e2da9e7802cd0;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1898453 from trunk

   * mod_lua: ap_lua_init_mutex() is not about thread only. It also calls
apr_global_mutex_child_init(). So I see no good reason to skip this hook
if !APR_HAS_THREADS.

Some #if APR_HAS_THREADS are also already in place in
ap_lua_init_mutex() anyway.

Submitted by: jailletc36
Reviewed by: jaillect36, ylavic, rpluem
Backported by: jailletc36

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900863 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c
index 665e2cddc7b..303890ef498 100644
--- a/modules/lua/mod_lua.c
+++ b/modules/lua/mod_lua.c
@@ -2176,9 +2176,8 @@ static void lua_register_hooks(apr_pool_t *p)
     
     /* Hook this right before FallbackResource kicks in */
     ap_hook_fixups(lua_map_handler_fixups, NULL, NULL, AP_LUA_HOOK_LAST-2);
-#if APR_HAS_THREADS
     ap_hook_child_init(ap_lua_init_mutex, NULL, NULL, APR_HOOK_MIDDLE);
-#endif
+
     /* providers */
     lua_authz_providers = apr_hash_make(p);