From: Sander Striker <striker@apache.org>
Date: Tue, 1 Jul 2003 01:29:13 +0000 (+0000)
Subject: Note backport.
X-Git-Tag: pre_ajp_proxy~1489
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82b3f8b2ff55d0b5883e830f2c9e1498159136d5;p=apache

Note backport.


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

diff --git a/CHANGES b/CHANGES
index f689a3bd2e..24ccbe623e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -34,12 +34,6 @@ Changes with Apache 2.1.0-dev
   *) Add support for IMT minor-type wildcards (e.g., text/*) to
      ExpiresByType.  PR#7991  [Ken Coar]
 
-  *) Prevent the server from crashing when entering infinite loops. The
-     new LimitInternalRecursion directive configures limits of subsequent
-     internal redirects and nested subrequests, after which the request
-     will be aborted.  PR 19753 (and probably others).
-     [William Rowe, Jeff Trawick, André Malo]
-
   *) mod_rewrite: Fix LA-U variable look ahead which didn't work correctly
      in directory context. Related to PR 8493.  [André Malo]
 
@@ -163,6 +157,12 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.47
 
+  *) Prevent the server from crashing when entering infinite loops. The
+     new LimitInternalRecursion directive configures limits of subsequent
+     internal redirects and nested subrequests, after which the request
+     will be aborted.  PR 19753 (and probably others).
+     [William Rowe, Jeff Trawick, André Malo]
+
   *) core_output_filter: don't split the brigade after a FLUSH bucket if
      it's the last bucket.  This prevents creating unneccessary empty
      brigades which may not be destroyed until the end of a keepalive