From ec634b804196d30fa75c06e1af0c6336e9c75136 Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Tue, 4 Dec 2012 02:22:24 +0000 Subject: [PATCH] Merge r1415023 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/: 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/branches/2.4.x@1416747 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ STATUS | 7 ------- server/config.c | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index 9b70819132..be14bcd743 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache 2.4.4 + *) 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/STATUS b/STATUS index 34e235c5da..2140ad0b08 100644 --- a/STATUS +++ b/STATUS @@ -97,13 +97,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x patch: http://people.apache.org/~jailletc36/backport_mod_dumpio.patch +1: jailletc36, sf, druggeri - * core: Accept "Include /some/dir" without wildcards as documented, - regression from 2.2.x. PR54223 - trunk patch: http://svn.apache.org/viewvc?rev=1415023&view=rev - 2.4.x patch: 2.4.x works - +1: covener, jim, druggeri - - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/server/config.c b/server/config.c index a23646d0e2..bc0804a40e 100644 --- a/server/config.c +++ b/server/config.c @@ -2021,7 +2021,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.50.1