diff options
| author | Stefan Fritsch <sf@apache.org> | 2011-01-18 10:58:26 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2011-01-18 10:58:26 +0100 |
| commit | 209d8907319f998f2d10f766bd0bfc4f5db4efcc (patch) | |
| tree | 9ea12986ce0244e0a9b59859921f616b2c8fc059 /include | |
| parent | remove some redundant NULL assignments (diff) | |
| download | apache2-209d8907319f998f2d10f766bd0bfc4f5db4efcc.tar.xz apache2-209d8907319f998f2d10f766bd0bfc4f5db4efcc.zip | |
Initialize the core_dir_config->sec_files and ->sec_if only if needed.
This saves some memory and two apr_array_append()s per directory merge.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1060283 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/ap_mmn.h | 3 | ||||
| -rw-r--r-- | include/http_core.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 097e7c0c1a..ac9b43006e 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -295,7 +295,8 @@ * dynamic growth of balancer members; Remove * BalancerNonce in favor of 'nonce' parameter. * 20110117.0 (2.3.11-dev) Merge <If> sections in separate step (ap_if_walk). - * Add core_dir_config->sec_if. + * Add core_dir_config->sec_if. Add ap_add_if_conf(). + * Add pool argument to ap_add_file_conf(). */ #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */ diff --git a/include/http_core.h b/include/http_core.h index 613148b346..e9df5c826c 100644 --- a/include/http_core.h +++ b/include/http_core.h @@ -598,8 +598,8 @@ void ap_core_reorder_directories(apr_pool_t *, server_rec *); /* for mod_perl */ 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(void) ap_add_file_conf(apr_pool_t *p, core_dir_config *conf, void *url_config); +AP_CORE_DECLARE(void) ap_add_if_conf(apr_pool_t *p, 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. */ |