From 03c359133029750a418376af625764db3f245926 Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Thu, 29 Nov 2012 01:34:19 +0000 Subject: [PATCH] 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 --- CHANGES | 3 +++ server/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 3522152c0b..0b4b7a95ff 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) core: Don't fail at startup with AH00554 when Include points to + a directory without any wildcard character. [Eric Covener] + *) core: Fail startup if the argument to ServerTokens is unrecognized. [Jackie Zhang ] 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; -- 2.40.0