]> granicus.if.org Git - apache/commit
Merge r1201443 from trunk:
authorEric Covener <covener@apache.org>
Sun, 13 Nov 2011 15:56:20 +0000 (15:56 +0000)
committerEric Covener <covener@apache.org>
Sun, 13 Nov 2011 15:56:20 +0000 (15:56 +0000)
commit14dfa1810b0bb2c50105b30d956cfa9fd7f2a09c
treeea004c40565aa801ab4510e9dad975a804b6838c
parent3fb597edadc14a70caa6281fb256da33c6a72614
Merge r1201443 from trunk:

add per-dir config merging to mod_lua so LuaHook* in multiple per-dir sections
behaves as expected instead of discarding previous sections.

Reviewed by: covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201445 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
docs/manual/mod/mod_lua.html.en
docs/manual/mod/mod_lua.xml
modules/lua/lua_vmprep.h
modules/lua/mod_lua.c
modules/lua/mod_lua.h