diff options
| author | Stefan Fritsch <sf@apache.org> | 2012-11-07 09:33:05 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2012-11-07 09:33:05 +0100 |
| commit | 289ead8ef7efc306ceaaa0645ac898a6c31ecb9d (patch) | |
| tree | 932ebeac5724e7f298af5f69803e47360d8a7e2d /include/http_config.h | |
| parent | Make <If> sections in virtual host context fill in cmd->path so that (diff) | |
| download | apache2-289ead8ef7efc306ceaaa0645ac898a6c31ecb9d.tar.xz apache2-289ead8ef7efc306ceaaa0645ac898a6c31ecb9d.zip | |
Make ap_check_cmd_context() treat <If> sections like <File> sections.
This is necessary to properly disallow directives that don't work in
<If>.
A separate NOT_IN_IF flag may be nicer, but would create much more
hassle when being backported to 2.4.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1406495 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/http_config.h')
| -rw-r--r-- | include/http_config.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/http_config.h b/include/http_config.h index 9d6b013b5e..52dce72402 100644 --- a/include/http_config.h +++ b/include/http_config.h @@ -901,11 +901,11 @@ AP_DECLARE(const char *) ap_check_cmd_context(cmd_parms *cmd, #define NOT_IN_LIMIT 0x02 /**< Forbidden in <Limit> */ #define NOT_IN_DIRECTORY 0x04 /**< Forbidden in <Directory> */ #define NOT_IN_LOCATION 0x08 /**< Forbidden in <Location> */ -#define NOT_IN_FILES 0x10 /**< Forbidden in <Files> */ +#define NOT_IN_FILES 0x10 /**< Forbidden in <Files> or <If>*/ #define NOT_IN_HTACCESS 0x20 /**< Forbidden in .htaccess files */ -/** Forbidden in <Directory>/<Location>/<Files>*/ +/** Forbidden in <Directory>/<Location>/<Files><If>*/ #define NOT_IN_DIR_LOC_FILE (NOT_IN_DIRECTORY|NOT_IN_LOCATION|NOT_IN_FILES) -/** Forbidden in <VirtualHost>/<Limit>/<Directory>/<Location>/<Files> */ +/** Forbidden in <VirtualHost>/<Limit>/<Directory>/<Location>/<Files>/<If> */ #define GLOBAL_ONLY (NOT_IN_VIRTUALHOST|NOT_IN_LIMIT|NOT_IN_DIR_LOC_FILE) /** @} */ |