From: Greg Ames <gregames@apache.org>
Date: Mon, 20 Mar 2006 16:13:45 +0000 (+0000)
Subject: bookkeeping for backport of 327008
X-Git-Tag: 2.2.1~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a928dc55c2e1600bdddd9f3c17eb4c9d7d207ea1;p=thirdparty%2Fapache%2Fhttpd.git

bookkeeping for backport of 327008


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@387231 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index b5d86b3f154..54ff37fbf47 100644
--- a/CHANGES
+++ b/CHANGES
@@ -40,9 +40,6 @@ Changes with Apache 2.2.1
   *) Fix syntax error in httpd.h with strict compilers.  PR 38740.
      [Per Olausson <pao darkheim.freeserve.co.uk>]
 
-  *) Preserve the Content-Length header for a proxied HEAD response.
-     PR 18757.  [Greg Ames]
-
   *) Fix recursive ErrorDocument handling.  PR 36090. 
      [Chris Darroch <chrisd pearsoncmg.com>]
 
@@ -995,6 +992,9 @@ Changes with Apache 2.1.1
 
 Changes with Apache 2.0.56
 
+  *) Preserve the Content-Length header for a proxied HEAD response.
+     PR 18757.  [Greg Ames]
+
   *) mod_cgi(d): Remove block on OPTIONS method so that scripts can
      respond to OPTIONS directly rather than via server default.
      [Roy Fielding] PR 15242