svn commit: r1415023 - in /httpd/httpd/trunk: CHANGES server/config.c

[co...@apache.org]

Author: covener
Date: Thu Nov 29 01:34:19 2012
New Revision: 1415023

URL: http://svn.apache.org/viewvc?rev=1415023&view=rev
Log:
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().


Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/server/config.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1415023&r1=1415022&r2=1415023&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Thu Nov 29 01:34:19 2012
@@ -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  <jackie.qq.zhang gmail.com>]
 

Modified: httpd/httpd/trunk/server/config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/config.c?rev=1415023&r1=1415022&r2=1415023&view=diff
==============================================================================
--- httpd/httpd/trunk/server/config.c (original)
+++ httpd/httpd/trunk/server/config.c Thu Nov 29 01:34:19 2012
@@ -2025,7 +2025,7 @@ AP_DECLARE(const char *) ap_process_fnma
     }
 
     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;