From: Jim Jagielski <jim@apache.org>
Date: Fri, 31 Mar 2006 20:33:48 +0000 (+0000)
Subject: Note backports to be in 2.2.1
X-Git-Tag: 2.3.0~2483
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f224c9678a9f282c02763192c0e15ccb4dab22b0;p=thirdparty%2Fapache%2Fhttpd.git

Note backports to be in 2.2.1


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

diff --git a/CHANGES b/CHANGES
index fea55b0e027..9d34dc4e2d9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,9 +20,6 @@ Changes with Apache 2.3.0
   *) mod_ssl: Fix spurious hostname mismatch warning for valid
      wildcard certificates.  PR 37911.  [Nick Burch <nick torchbox.com>]
 
-  *) mod_proxy: Fix KeepAlives not being allowed and set to
-     backend servers. PR 38602. [Ruediger Pluem, Jim Jagielski]
-
   *) Correctly initialize mod_proxy workers, which use a
      combination of local and shared datasets. Adjust logging
      to better trace usage. PR 38403. [Jim Jagielski]
@@ -102,9 +99,12 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.1
 
+  *) mod_proxy: Fix KeepAlives not being allowed and set to
+     backend servers. PR 38602. [Ruediger Pluem, Jim Jagielski]
+
   *) mod_proxy: If we get an error reading the upstream response,
-     close the connection.
-     [Justin Erenkrantz, Roy T. Fielding, Jim Jagielski, Ruediger Pluem]
+     close the connection.  [Justin Erenkrantz, Roy T. Fielding,
+     Jim Jagielski, Ruediger Pluem]
 
   *) mod_proxy_ajp: Support common headers of the AJP protocol in responses.
      PR 38340. [Aleksey Pesternikov <apesternikov yahoo.com>]