Commit 45529216 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Follow up to r1740928: including NOT_IN_PROXY in NOT_IN_DIR_LOC_FILE is both 

incomplete and not backportable, fix it by introducing NOT_IN_DIR_CONTEXT.

Per ap_check_cmd_context(), NOT_IN_DIR_LOC_FILE actually/really means "not in
any directory context", while the definition itself does not include all the
existing directory contexts (e.g. <Limit>, or <Proxy> before r1740928).

This is a bit of a misnomer, at least, so instead of (ab)using it by adding the
missing contexts (in an incompatible way), let's define NOT_IN_DIR_CONTEXT to
really exclude all directory context (i.e. NOT_IN_DIR_LOC_FILE + NOT_IN_LIMIT +
NOT_IN_PROXY) and use it wherever NOT_IN_DIR_LOC_FILE was used.

This is by itself a major MMN bump (modules not compiled with this commit and
having directives checked against NOT_IN_DIR_LOC_FILE won't be caught the same
way by NOT_IN_DIR_CONTEXT in the new ap_check_cmd_context() code), but with the
below change, 2.4.x should work as before:

-   if ((forbidden & NOT_IN_DIR_CONTEXT) == NOT_IN_DIR_CONTEXT) {
+   if ((forbidden & NOT_IN_DIR_LOC_FILE) == NOT_IN_DIR_LOC_FILE) {
        if (cmd->path != NULL) {
            return apr_pstrcat(cmd->pool, cmd->cmd->name, gt,
-                           " cannot occur within directory context", NULL);
+                           " cannot occur within <Directory/Location/Files/Proxy> "
+                           "section", NULL);
        }
        ...
    }



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

include/ap_mmn.h

+2 −0
Original line number Diff line number Diff line
@@ -557,6 +557,8 @@ 
 * 20161018.6 (2.5.0-dev)  Add ap_update_sb_handle()

 * 20161018.7 (2.5.0-dev)  Add flags field to module_struct and function

 *                         ap_get_module_flags()

 * 20171014.1 (2.5.0-dev)  Add NOT_IN_DIR_CONTEXT replacing NOT_IN_DIR_LOC_FILE

 *                         semantics

 */



#define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */

include/http_config.h

+4 −2
Original line number Diff line number Diff line
@@ -950,10 +950,12 @@ AP_DECLARE(const char *) ap_check_cmd_context(cmd_parms *cmd, 
#define  NOT_IN_FILES           0x10 /**< Forbidden in &lt;Files&gt; or &lt;If&gt;*/

#define  NOT_IN_HTACCESS        0x20 /**< Forbidden in .htaccess files */

#define  NOT_IN_PROXY           0x40 /**< Forbidden in &lt;Proxy&gt; */

/** Forbidden in &lt;Directory&gt;/&lt;Location&gt;/&lt;Files&gt;&lt;If&gt;*/

#define  NOT_IN_DIR_LOC_FILE    (NOT_IN_DIRECTORY|NOT_IN_LOCATION|NOT_IN_FILES)

/** Forbidden in &lt;Directory&gt;/&lt;Location&gt;/&lt;Files&gt;&lt;If&gt;&lt;Proxy&gt;*/

#define  NOT_IN_DIR_LOC_FILE    (NOT_IN_DIRECTORY|NOT_IN_LOCATION|NOT_IN_FILES|NOT_IN_PROXY)

#define  NOT_IN_DIR_CONTEXT     (NOT_IN_LIMIT|NOT_IN_DIR_LOC_FILE|NOT_IN_PROXY)

/** Forbidden in &lt;VirtualHost&gt;/&lt;Limit&gt;/&lt;Directory&gt;/&lt;Location&gt;/&lt;Files&gt;/&lt;If&gt;&lt;Proxy&gt;*/

#define  GLOBAL_ONLY            (NOT_IN_VIRTUALHOST|NOT_IN_LIMIT|NOT_IN_DIR_LOC_FILE)

#define  GLOBAL_ONLY            (NOT_IN_VIRTUALHOST|NOT_IN_DIR_CONTEXT)



/** @} */

modules/generators/mod_suexec.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static const char *set_suexec_ugid(cmd_parms *cmd, void *mconfig, 
                                   const char *uid, const char *gid)

{

    suexec_config_t *cfg = (suexec_config_t *) mconfig;

    const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE);

    const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_CONTEXT);



    if (err != NULL) {

        return err;

modules/http/http_core.c

+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static const char *set_keep_alive_timeout(cmd_parms *cmd, void *dummy, 
                                          const char *arg)

{

    apr_interval_time_t timeout;

    const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE);

    const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_CONTEXT);

    if (err != NULL) {

        return err;

    }
@@ -78,7 +78,7 @@ static const char *set_keep_alive_timeout(cmd_parms *cmd, void *dummy, 
static const char *set_keep_alive(cmd_parms *cmd, void *dummy,

                                  int arg)

{

    const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE);

    const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_CONTEXT);

    if (err != NULL) {

        return err;

    }
@@ -90,7 +90,7 @@ static const char *set_keep_alive(cmd_parms *cmd, void *dummy, 
static const char *set_keep_alive_max(cmd_parms *cmd, void *dummy,

                                      const char *arg)

{

    const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE);

    const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_CONTEXT);

    if (err != NULL) {

        return err;

    }

modules/mappers/mod_alias.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static const char *add_alias_internal(cmd_parms *cmd, void *dummy, 


    /* XXX: real can NOT be relative to DocumentRoot here... compat bug. */



    const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE);

    const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_CONTEXT);



    if (err != NULL) {

        return err;