diff options
| author | Stefan Fritsch <sf@apache.org> | 2011-01-17 12:02:38 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2011-01-17 12:02:38 +0100 |
| commit | a38d3c9e232f9b28d7136e032b6972fcaf4545d7 (patch) | |
| tree | cd46820b1cac5c3c23ef16bd90e6a68a224fc9e8 /include/http_core.h | |
| parent | Add server directory to INCLUDES. (diff) | |
| download | apache2-a38d3c9e232f9b28d7136e032b6972fcaf4545d7.tar.xz apache2-a38d3c9e232f9b28d7136e032b6972fcaf4545d7.zip | |
Merge the <If> sections in a separate step ap_if_walk, after ap_location_walk.
This makes <If> apply to all requests, not only to file base requests and
it allows to use <If> inside <Directory>, <Location>, and <Files> sections.
The merging of <If> sections always happens after the merging of <Location>
sections, even if the <If> section is embedded inside a <Directory> or
<Files> section.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1059867 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/http_core.h')
| -rw-r--r-- | include/http_core.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/http_core.h b/include/http_core.h index f3b7f5b910..613148b346 100644 --- a/include/http_core.h +++ b/include/http_core.h @@ -362,7 +362,8 @@ typedef struct { #define AP_NOTE_DIRECTORY_WALK 0 #define AP_NOTE_LOCATION_WALK 1 #define AP_NOTE_FILE_WALK 2 -#define AP_NUM_STD_NOTES 3 +#define AP_NOTE_IF_WALK 3 +#define AP_NUM_STD_NOTES 4 /** * Reserve an element in the core_request_config->notes array @@ -499,6 +500,7 @@ typedef struct { /* Access control */ apr_array_header_t *sec_file; + apr_array_header_t *sec_if; ap_regex_t *r; const char *mime_type; /* forced with ForceType */ @@ -597,6 +599,7 @@ void ap_core_reorder_directories(apr_pool_t *, server_rec *); AP_CORE_DECLARE(void) ap_add_per_dir_conf(server_rec *s, void *dir_config); AP_CORE_DECLARE(void) ap_add_per_url_conf(server_rec *s, void *url_config); AP_CORE_DECLARE(void) ap_add_file_conf(core_dir_config *conf, void *url_config); +AP_CORE_DECLARE(void) ap_add_if_conf(core_dir_config *conf, void *url_config); AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section(cmd_parms *cmd, void *dummy, const char *arg); /* Core filters; not exported. */ |