From: Jim Jagielski <jim@apache.org>
Date: Thu, 30 Mar 2006 17:47:26 +0000 (+0000)
Subject: Note merged backport
X-Git-Tag: 2.3.0~2486
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4641398a49732a0db96b5ca2aa665679dbee705a;p=apache

Note merged backport

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

diff --git a/CHANGES b/CHANGES
index c3b67ed83f..fe91480dec 100644
--- a/CHANGES
+++ b/CHANGES
@@ -65,10 +65,6 @@ Changes with Apache 2.3.0
   *) If a connection is aborted while waiting for a chunked line, flag the
      connection as errored out.  [Justin Erenkrantz]
 
-  *) mod_proxy: If we get an error reading the upstream response,
-     close the connection.
-     [Justin Erenkrantz, Roy T. Fielding, Jim Jagielski, Ruediger Pluem]
-
   *) mod_authz_dbd: SQL authz with Login/Session support [Nick Kew]
 
   *) Fix typo in ProxyStatus syntax error message.
@@ -102,6 +98,10 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.1
 
+  *) mod_proxy: If we get an error reading the upstream response,
+     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>]