From: André Malo <nd@apache.org>
Date: Wed, 23 Jul 2003 20:32:06 +0000 (+0000)
Subject: sync
X-Git-Tag: pre_ajp_proxy~1384
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=627384611970bfe26f4655d7129af6628e89f2b3;p=apache

sync


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

diff --git a/CHANGES b/CHANGES
index d7208388f0..4409d24463 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,10 +5,6 @@ Changes with Apache 2.1.0-dev
   *) mod_deflate: Don't attempt to hold all of the response until we're
      done.  [Justin Erenkrantz]
 
-  *) mod_include: Fix a trio of bugs that would cause various unusual
-     sequences of parsed bytes to omit portions of the output stream.
-     PR 21095. [Ron Park <ronald.park@cnet.com>, André Malo, Cliff Woolley]
-
   *) mod_ssl: Fix segfaults after renegotiation failure. PR 21370
      [Hartmut Keil <Hartmut.Keil@adnovum.ch>]
 
@@ -203,6 +199,10 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.48
 
+  *) mod_include: Fix a trio of bugs that would cause various unusual
+     sequences of parsed bytes to omit portions of the output stream.
+     PR 21095. [Ron Park <ronald.park@cnet.com>, André Malo, Cliff Woolley]
+
   *) Update the header token parsing code to allow LWS between the
      token word and the ':' seperator.  [PR 16520]
      [Kris Verbeeck <kris.verbeeck@advalvas.be>,Nicel KM <mnicel@yahoo.com>]