From: André Malo <nd@apache.org>
Date: Sun, 6 Jun 2004 22:24:27 +0000 (+0000)
Subject: sync
X-Git-Tag: pre_ajp_proxy~176
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44e726eec6ab2b737ee58f3b98b525cb46894280;p=apache

sync


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

diff --git a/CHANGES b/CHANGES
index de9a2908b5..2c15c4589f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -110,9 +110,6 @@ Changes with Apache 2.1.0-dev
      status and terminate the provider chain prior to checking the password.
      [Geoffrey Young]
 
-  *) Allow RequestHeader directives to be conditional. PR 27951.
-     [Vincent Deffontaines <vincent gryzor.com>, André Malo]
-
   *) mod_rewrite no longer turns forward proxy requests into reverse proxy
      requests. PR 28125  [ast domdv.de, André Malo]
 
@@ -381,6 +378,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.50
 
+  *) Allow RequestHeader directives to be conditional. PR 27951.
+     [Vincent Deffontaines <vincent gryzor.com>, André Malo]
+
   *) Allow LimitRequestBody to be reset to unlimited. PR 29106
      [André Malo]