httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r1416747 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS server/config.c
Date Tue, 04 Dec 2012 02:22:25 GMT
Author: covener
Date: Tue Dec  4 02:22:24 2012
New Revision: 1416747

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



Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/server/config.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1415023

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1416747&r1=1416746&r2=1416747&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Dec  4 02:22:24 2012
@@ -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>]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1416747&r1=1416746&r2=1416747&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Dec  4 02:22:24 2012
@@ -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 ]
 

Modified: httpd/httpd/branches/2.4.x/server/config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/config.c?rev=1416747&r1=1416746&r2=1416747&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/config.c (original)
+++ httpd/httpd/branches/2.4.x/server/config.c Tue Dec  4 02:22:24 2012
@@ -2021,7 +2021,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;



Mime
View raw message