diff options
| author | Christophe Jaillet <jailletc36@apache.org> | 2019-02-10 10:14:37 +0000 |
|---|---|---|
| committer | Christophe Jaillet <jailletc36@apache.org> | 2019-02-10 10:14:37 +0000 |
| commit | 33b2ad9f1cd2ea29146a7615128f6f7bd6b79deb (patch) | |
| tree | 1b638dca86a0258a246e6f7845df15c9aaf29dd8 /server/config.c | |
| parent | 20cb4baffce4c95da637ee968feb72b0fe3b673d (diff) | |
| download | httpd-33b2ad9f1cd2ea29146a7615128f6f7bd6b79deb.tar.gz | |
Follow up to r1847430.
- These flags are not for apr_dir_ function. Clarify comment.
- Initialize 'depth', especially when AP_DIR_FLAG_RECURSIVE is explicitelly required.
- Avoid an harmless over-allocation .
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1853302 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/config.c')
| -rw-r--r-- | server/config.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/server/config.c b/server/config.c index dcadba0c66..13bc092269 100644 --- a/server/config.c +++ b/server/config.c @@ -1920,6 +1920,7 @@ AP_DECLARE(const char *) ap_process_fnmatch_configs(server_rec *s, w.flags = (optional ? AP_DIR_FLAG_OPTIONAL : AP_DIR_FLAG_NONE) | AP_DIR_FLAG_RECURSIVE; w.cb = process_resource_config_cb; w.ctx = &cfgs; + w.depth = 0; /* don't require conf/httpd.conf if we have a -C or -c switch */ if ((ap_server_pre_read_config->nelts |