Synch with 2.0 branch.

Justin beat me to the vote, but I had the time for the backport. :)

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

diff --git a/CHANGES b/CHANGES
index a13b5dd24f44afddb6dcb629787b015e4d86021c..efcc64911a405c1f8d6ce33a9a952fdd430ea581 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -43,13 +43,6 @@ Changes with Apache 2.1.0-dev
   *) mod_rewrite: Cookie creation now works locale independent.
      [André Malo]
 
-  *) proxy_http fix: mod_proxy hangs when both KeepAlive and 
-     ProxyErrorOverride are enabled, and a non-200 response without a 
-     body is generated by the backend server. (e.g.: a client makes a 
-     request containing the "If-Modified-Since" and "If-None-Match" 
-     headers, to which the backend server respond with status 304.)
-     [Graham Wiseman <gwiseman fscinternet.com>, Richard Reiner]
-
   *) mod_ssl: Add support for distributed session cache using 'distcache'.
      [Geoff Thorpe <geoff geoffthorpe.net>]
 
@@ -279,6 +272,13 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) proxy_http fix: mod_proxy hangs when both KeepAlive and
+     ProxyErrorOverride are enabled, and a non-200 response without a
+     body is generated by the backend server. (e.g.: a client makes a
+     request containing the "If-Modified-Since" and "If-None-Match"
+     headers, to which the backend server respond with status 304.)
+     [Graham Wiseman <gwiseman fscinternet.com>, Richard Reiner]
+
   *) mod_dav: Reject requests which include an unescaped fragment in the
      Request-URI.  PR 21779.  [Amit Athavale <amit_athavale lycos.com>]