From: André Malo <nd@apache.org>
Date: Thu, 26 Aug 2004 22:30:53 +0000 (+0000)
Subject: sync
X-Git-Tag: STRIKER_2_1_0_RC1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3009daa886ac5fc1e5d8f2b45747295499baebfa;p=thirdparty%2Fapache%2Fhttpd.git

sync


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

diff --git a/CHANGES b/CHANGES
index ec75fb6f9f6..49df076b5e2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -166,16 +166,10 @@ Changes with Apache 2.1.0-dev
      status and terminate the provider chain prior to checking the password.
      [Geoffrey Young]
 
-  *) mod_rewrite now officially supports RewriteRules in <Proxy> sections.
-     PR 27985.  [André Malo]
-
   *) mod_cgid: Don't allow Scriptsock to be specified inside VirtualHost;
      Don't place script socket inside default server root instead of
      actual server root.  PR 27886.  [Jeff Trawick]
 
-  *) Satisfy directives now can be influenced by a surrounding <Limit>
-     container.  PR 14726.  [André Malo]
-
   *) mod_proxy: Fix handling of non-200 success status codes when
      "ProxyErrorOverride On" is configured.  PR 20183.
      [Marcus Janson <marcus.janson tre.se>, Joe Orton]
@@ -415,6 +409,12 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.51
 
+  *) Satisfy directives now can be influenced by a surrounding <Limit>
+     container.  PR 14726.  [André Malo]
+
+  *) mod_rewrite now officially supports RewriteRules in <Proxy> sections.
+     PR 27985.  [André Malo]
+
   *) mod_disk_cache: Implement binary format for on-disk header files.
      [Brian Akins <bakins web.turner.com>, Justin Erenkrantz]