Commit cea182f3 authored by Eric Covener's avatar Eric Covener
Browse files

quick handlers and translate_name in lua can't be keyed off 

Directory/Filename/htaccess



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1197853 13f79535-47bb-0310-9956-ffa450edef68
parent f1708c33

CHANGES

+5 −0
Changes for CHANGES: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,11 @@ Changes with Apache 2.3.15 
     PR 51714. [Stefan Fritsch, Jim Jagielski, Ruediger Pluem, Eric Covener,

     <lowprio20 gmail.com>]



  *) mod_lua: Prevent early Lua hooks (LuaHookTranslateName and 

     LuaHookQuickHandler) from being configured in <Directory>, <Files>, 

     and htaccess where the configuration would have been ignored.

     [Eric Covener]



  *) mod_lua: Resolve "attempt to index local 'r' (a userdata value)" errors

     in LuaMapHandler scripts [Eric Covener]

modules/lua/mod_lua.c

+21 −0
Changes for modules/lua/mod_lua.c: 21 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -619,6 +619,11 @@ static const char *register_translate_name_hook(cmd_parms *cmd, void *_cfg, 
                                                const char *file,

                                                const char *function)

{

    const char *err = ap_check_cmd_context(cmd, NOT_IN_DIRECTORY|NOT_IN_FILES|

                                           NOT_IN_HTACCESS);

    if (err) {

        return err;

    }

    return register_named_file_function_hook("translate_name", cmd, _cfg,

                                             file, function);

}
@@ -626,6 +631,11 @@ static const char *register_translate_name_hook(cmd_parms *cmd, void *_cfg, 
static const char *register_translate_name_block(cmd_parms *cmd, void *_cfg,

                                                 const char *line)

{

    const char *err = ap_check_cmd_context(cmd, NOT_IN_DIRECTORY|NOT_IN_FILES|

                                                NOT_IN_HTACCESS);

    if (err) {

        return err;

    }

    return register_named_block_function_hook("translate_name", cmd, _cfg,

                                              line);

}
@@ -724,12 +734,23 @@ static const char *register_insert_filter_hook(cmd_parms *cmd, void *_cfg, 
static const char *register_quick_hook(cmd_parms *cmd, void *_cfg,

                                       const char *file, const char *function)

{

    const char *err = ap_check_cmd_context(cmd, NOT_IN_DIRECTORY|NOT_IN_FILES|

                                                NOT_IN_HTACCESS);

    if (err) {

        return err;

    }

    return register_named_file_function_hook("quick", cmd, _cfg, file,

                                             function);

}

static const char *register_quick_block(cmd_parms *cmd, void *_cfg,

                                        const char *line)

{

    const char *err = ap_check_cmd_context(cmd, NOT_IN_DIRECTORY|NOT_IN_FILES|

                                                NOT_IN_HTACCESS);

    if (err) {

        return err;

    }

 

    return register_named_block_function_hook("quick", cmd, _cfg,

                                              line);

}