diff options
| author | Eric Covener <covener@apache.org> | 2011-11-13 16:48:06 +0100 |
|---|---|---|
| committer | Eric Covener <covener@apache.org> | 2011-11-13 16:48:06 +0100 |
| commit | b53e38b314ee235c223227ce83ed78b6fb014b90 (patch) | |
| tree | 9293aa32e65d1d618bcdbcb1338913878c8f1ced /modules/lua/mod_lua.h | |
| parent | set svn:ignores (diff) | |
| download | apache2-b53e38b314ee235c223227ce83ed78b6fb014b90.tar.xz apache2-b53e38b314ee235c223227ce83ed78b6fb014b90.zip | |
add per-dir config merging to mod_lua so LuaHook* in multiple per-dir sections
behaves as expected instead of discarding previous sections.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1201443 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | modules/lua/mod_lua.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/modules/lua/mod_lua.h b/modules/lua/mod_lua.h index 82a0e4ffcb..16627240eb 100644 --- a/modules/lua/mod_lua.h +++ b/modules/lua/mod_lua.h @@ -69,6 +69,12 @@ #include "lua_request.h" #include "lua_vmprep.h" +typedef enum { + AP_LUA_INHERIT_UNSET = -1, + AP_LUA_INHERIT_NONE = 0, + AP_LUA_INHERIT_PARENT_FIRST = 1, + AP_LUA_INHERIT_PARENT_LAST = 2, +} ap_lua_inherit_t; /** * make a userdata out of a C pointer, and vice versa @@ -103,6 +109,10 @@ typedef struct /* the actual directory being configured */ char *dir; + + /* Whether Lua scripts in a sub-dir are run before parents */ + ap_lua_inherit_t inherit; + } ap_lua_dir_cfg; typedef struct |