You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2022/05/13 17:05:31 UTC
svn commit: r1900863 - in /httpd/httpd/branches/2.4.x: ./ modules/lua/mod_lua.c
Author: jailletc36
Date: Fri May 13 17:05:31 2022
New Revision: 1900863
URL: http://svn.apache.org/viewvc?rev=1900863&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1898453
Modified: httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c?rev=1900863&r1=1900862&r2=1900863&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c (original)
+++ httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c Fri May 13 17:05:31 2022
@@ -2176,9 +2176,8 @@ static void lua_register_hooks(apr_pool_
/* 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);