diff options
| author | Eric Covener <covener@apache.org> | 2012-11-29 01:34:19 +0000 |
|---|---|---|
| committer | Eric Covener <covener@apache.org> | 2012-11-29 01:34:19 +0000 |
| commit | 03c359133029750a418376af625764db3f245926 (patch) | |
| tree | 446b1866c557714a287581365d02ba0e4940b75f /server/config.c | |
| parent | ddabe66f5e8fc9684b9c7b2e253aac4605fd3bb5 (diff) | |
| download | httpd-03c359133029750a418376af625764db3f245926.tar.gz | |
PR54223: 2.4 generates AH00554 when Include points to a directory with no wildcard.
r931435 refactored ap_process_resource_config() so it didn't read through
directories, but also changed a path non-fnmatch directories are passed
through to call ap_process_resource_config().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415023 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/config.c')
| -rw-r--r-- | server/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/config.c b/server/config.c index ffc6694870..b8b5033aff 100644 --- a/server/config.c +++ b/server/config.c @@ -2025,7 +2025,7 @@ AP_DECLARE(const char *) ap_process_fnmatch_configs(server_rec *s, } if (!apr_fnmatch_test(fname)) { - return ap_process_resource_config(s, fname, conftree, p, ptemp); + return process_resource_config_nofnmatch(s, fname, conftree, p, ptemp, 0, optional); } else { apr_status_t status; |