From: Jim Jagielski <jim@apache.org>
Date: Thu, 30 Mar 2006 17:38:15 +0000 (+0000)
Subject: Backported to 2.2.1...
X-Git-Tag: 2.3.0~2487
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38ea125e89937a0c06c6299b35af670a5480c611;p=thirdparty%2Fapache%2Fhttpd.git

Backported to 2.2.1...

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

diff --git a/CHANGES b/CHANGES
index 6f5c3c6f75f..c3b67ed83fb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,11 +2,6 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
-  *) mod_proxy_ajp: Crosscheck the length of the body chunk with the length of
-     the ajp message to prevent mod_proxy_ajp from reading beyond the buffer
-     boundaries and thus revealing possibly sensitive memory contents to the
-     client. [Ruediger Pluem]
-
   *) mod_proxy_http: Do send keep-alive header if the client sent
      connection: keep-alive and do not close backend connection if the client
      sent connection: close. PR 38524. [Ruediger Pluem, Joe Orton]
@@ -31,13 +26,6 @@ Changes with Apache 2.3.0
   *) Respect GracefulShutdownTimeout in the worker and event MPMs.
      [Chris Darroch <chrisd pearsoncmg.com>, Garrett Rooney]
 
-  *) mod_proxy_balancer: Do not overwrite the status of initialized workers and
-     respect the configured status of uninitilized workers when creating a new
-     child process. [Ruediger Pluem]
-
-  *) mod_proxy_ajp: Support common headers of the AJP protocol in responses.
-     PR 38340. [Aleksey Pesternikov <apesternikov yahoo.com>]
-
   *) core: Reject invalid Expect header immediately. PR 38123.
      [Ruediger Pluem]
 
@@ -114,6 +102,18 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.1
 
+  *) mod_proxy_ajp: Support common headers of the AJP protocol in responses.
+     PR 38340. [Aleksey Pesternikov <apesternikov yahoo.com>]
+
+  *) mod_proxy_balancer: Do not overwrite the status of initialized workers and
+     respect the configured status of uninitilized workers when creating a new
+     child process. [Ruediger Pluem]
+
+  *) mod_proxy_ajp: Crosscheck the length of the body chunk with the length of
+     the ajp message to prevent mod_proxy_ajp from reading beyond the buffer
+     boundaries and thus revealing possibly sensitive memory contents to the
+     client. [Ruediger Pluem]
+
   *) Ensure that the proper status line is written to the client, fixing
      incorrect status lines caused by filters which modify r->status without 
      resetting r->status_line, such as the built-in byterange filter.