From: André Malo <nd@apache.org>
Date: Sun, 15 Aug 2004 23:58:46 +0000 (+0000)
Subject: sync
X-Git-Tag: STRIKER_2_1_0_RC1~110
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c05e623ee1253c5164034fdbaf653ba2643b00b;p=apache

sync


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104681 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 2dc07d644a..bf404e234c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -63,9 +63,6 @@ Changes with Apache 2.1.0-dev
      to enable Header and RequestHeader directives to be used to set up
      testcases for pre-fixups request phases [Nick Kew]
 
-  *) mod_dir: the trailing-slash behaviour is now configurable using the
-     DirectorySlash directive.  [André Malo]
-
   *) mod_proxy: multiple bugfixes, principally support cookies in
      ProxyPassReverse, and don't canonicalise URL passed to backend.
      Documentation correspondingly updated. [Nick Kew <nick webthing.com>]
@@ -131,11 +128,6 @@ Changes with Apache 2.1.0-dev
      at compile time using the -DAP_MAX_INCLUDE_DIR_DEPTH switch.
      PR 28492.  [André Malo]
 
-  *) Recursive Include directives no longer crash. The server stops
-     including configuration files after a certain nesting level (128
-     as distributed). This is configurable at compile time using the
-     -DAP_MAX_INCLUDE_DEPTH switch. PR 28370.  [André Malo]
-
   *) mod_headers: Allow %% in header values to represent a literal %.
      [André Malo]
 
@@ -228,9 +220,6 @@ Changes with Apache 2.1.0-dev
      true if the pattern is a file with execution permissions.
      [André Malo]
 
-  *) Allow proxying of resources that are invoked via DirectoryIndex.
-     PR 14648, 15112, 29961.  [André Malo]
-
   *) mod_rewrite: Allow proxying and RewriteRules in directory context
      for subrequests.  PR 14648, 15114.  [André Malo]
 
@@ -376,9 +365,6 @@ Changes with Apache 2.1.0-dev
   *) Allow apachectl to perform status with links and elinks as well.
      [Justin Erenkrantz]
 
-  *) Extend the SetEnvIf directive to capture subexpressions of the
-     matched value.  [André Malo]
-
   *) mod_log_config change optional hook to return previous handler
      [Ian Holsman]
 
@@ -431,6 +417,20 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.51
 
+  *) Extend the SetEnvIf directive to capture subexpressions of the
+     matched value.  [André Malo]
+
+  *) Recursive Include directives no longer crash. The server stops
+     including configuration files after a certain nesting level (128
+     as distributed). This is configurable at compile time using the
+     -DAP_MAX_INCLUDE_DEPTH switch. PR 28370.  [André Malo]
+
+  *) mod_dir: the trailing-slash behaviour is now configurable using the
+     DirectorySlash directive.  [André Malo]
+
+  *) Allow proxying of resources that are invoked via DirectoryIndex.
+     PR 14648, 15112, 29961.  [André Malo]
+
   *) util_ldap: Switched the lock types on the shared memory cache 
      from thread reader/writer locks to global mutexes in order to 
      provide cross process cache protection. [Brad Nicholes]