From: André Malo <nd@apache.org>
Date: Fri, 27 Aug 2004 19:44:49 +0000 (+0000)
Subject: sync
X-Git-Tag: STRIKER_2_1_0_RC1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=893c206ba82b8fc529d50f1905700e6448cbb51f;p=thirdparty%2Fapache%2Fhttpd.git

sync


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

diff --git a/CHANGES b/CHANGES
index 5601596d17d..b6240ec4e56 100644
--- a/CHANGES
+++ b/CHANGES
@@ -123,12 +123,6 @@ Changes with Apache 2.1.0-dev
      ap_add_module, ap_add_loaded_module, ap_setup_prelinked_modules,
      and ap_process_resource_config.  [André Malo]
 
-  *) Include directives no longer refuse to process symlinks on
-     directories. Instead there's now a maximum nesting level
-     of included directories (128 as distributed). This is configurable
-     at compile time using the -DAP_MAX_INCLUDE_DIR_DEPTH switch.
-     PR 28492.  [André Malo]
-
   *) mod_headers: Allow %% in header values to represent a literal %.
      [André Malo]
 
@@ -391,6 +385,19 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.51
 
+  *) mod_include no longer checks for recursion, because that's done
+     in the core. This allows for carefully usage of recursive SSI.
+     [André Malo]
+
+  *) Fix memory leak in the cache handling of mod_rewrite. PR 27862.
+     [chunyan sheng <shengperson yahoo.com>, André Malo]
+
+  *) Include directives no longer refuse to process symlinks on
+     directories. Instead there's now a maximum nesting level
+     of included directories (128 as distributed). This is configurable
+     at compile time using the -DAP_MAX_INCLUDE_DIR_DEPTH switch.
+     PR 28492.  [André Malo]
+
   *) Win32: apache -k start|restart|install|config can leave stranded
      piped logger processes (eg, rotatelogs.exe) due to improper
      server shutdown on these code paths.