From: André Malo <nd@apache.org>
Date: Wed, 2 Jun 2004 22:52:29 +0000 (+0000)
Subject: sync
X-Git-Tag: pre_ajp_proxy~205
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83d554c65b15f8d08659def790ecb9f12d657948;p=apache

sync


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

diff --git a/CHANGES b/CHANGES
index 65117b4747..a06d48d0e3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -86,10 +86,6 @@ Changes with Apache 2.1.0-dev
   *) mod_log_config now logs all Set-Cookie headers if the %{Set-Cookie}o
      format is used.  PR 27787.  [André Malo]
 
-  *) Fix a bunch of cases where the return code of the regex compiler
-     was not checked properly. This affects: mod_setenvif, mod_usertrack,
-     mod_proxy, mod_proxy_ftp and core. PR 28218.  [André Malo]
-
   *) mod_usertrack: Escape the cookie name before pasting into the
      regexp.  [André Malo]
 
@@ -372,6 +368,10 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.50
 
+  *) Fix a bunch of cases where the return code of the regex compiler
+     was not checked properly. This affects: mod_setenvif, mod_usertrack,
+     mod_proxy, mod_proxy_ftp and core. PR 28218.  [André Malo]
+
   *) mod_ssl: Fix a potential segfault in the 'shmcb' session cache for
      small cache sizes.  PR 27751.  [Geoff Thorpe <geoff geoffthorpe.net>]