From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Mon, 7 Mar 2005 07:23:52 +0000 (+0000)
Subject: Add two changes entries based on r156306 and r156330.
X-Git-Tag: 2.1.4~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a53cd1cadb8330e452159a85bce4ca8931a79f8;p=thirdparty%2Fapache%2Fhttpd.git

Add two changes entries based on r156306 and r156330.


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

diff --git a/CHANGES b/CHANGES
index b7c2d801bc0..a27be68a795 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,12 @@ Changes with Apache 2.1.4
   *) mod_cache: Fix error where incoming Cache-Control would be ignored.
      [Justin Erenkrantz]
 
+  *) mod_cache: Correctly handle originally conditional requests.
+     [Sander Striker]
+
+  *) mod_disk_cache: Correctly update cached headers on revalidated responses.
+     [Sander Striker, Justin Erenkrantz]
+
   *) worker MPM/mod_status: Support per-worker tracking of pid and
      generation in the scoreboard so that mod_status can accurately
      represent workers in processes which are gracefully terminating.