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

diff --git a/CHANGES b/CHANGES
index 9b70819132bd2e99ef27f63e8d99d4e076391249..be14bcd743f323a4f182ca801be0d1f33c4918c1 100644 (file)
--- 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  <jackie.qq.zhang gmail.com>]
 

diff --git a/STATUS b/STATUS
index 34e235c5da3d0ac998096c1c982a50d48461fd3c..2140ad0b0892f2d74b53168b76e347c5f2abad51 100644 (file)
--- 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 a23646d0e274c6b542d87563b92913762e22a060..bc0804a40e5a4bd0c6a49c77338420849f53bf56 100644 (file)
--- 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;