From: Paul J. Reder <rederpj@apache.org>
Date: Thu, 5 Feb 2004 18:42:50 +0000 (+0000)
Subject: Re-synch with 2.0 stable branch after backport.
X-Git-Tag: pre_ajp_proxy~730
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9420a65a086804e9ce965d23c3541dc0d55486e;p=apache

Re-synch with 2.0 stable branch after backport.


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

diff --git a/CHANGES b/CHANGES
index 0c83eb222c..4ab7d91344 100644
--- a/CHANGES
+++ b/CHANGES
@@ -104,10 +104,6 @@ Changes with Apache 2.1.0-dev
   *) mod_auth_ldap: Fix some segfaults in the cache logic.  PR 18756.
      [Matthieu Estrade <apache moresecurity.org>]
 
-  *) mod_setenvif: Fix the regex optimizer, which under circumstances
-     treated the supplied regex as literal string. PR 24219.
-     [André Malo]
-
   *) Log an error when requests for URIs which fail to map to a valid 
      filesystem name are rejected with 403.  [Jeff Trawick]
 
@@ -268,6 +264,10 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) mod_setenvif: Fix the regex optimizer, which under circumstances
+     treated the supplied regex as literal string. PR 24219.
+     [André Malo]
+
   *) ap_mpm.h: Fix include guard of ap_mpm.h to reference mpm
      instead of mmn. [André Malo]