From: Jim Jagielski <jim@apache.org>
Date: Tue, 21 Jan 2014 16:55:04 +0000 (+0000)
Subject: Merge r1518269 from trunk:
X-Git-Tag: 2.4.8~224
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=411e718b5eac52bdef46681532046c63a0416ef6;p=apache

Merge r1518269 from trunk:

Expires in a 304 is not a contradiction in terms of r1487118:

     - Expires, Cache-Control, and/or Vary, if the field-value might
        differ from that sent in any previous response for the same
        variant



Submitted by: covener
Reviewed/backported by: jim


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

diff --git a/STATUS b/STATUS
index ed3879ac28..bd28fe9b47 100644
--- a/STATUS
+++ b/STATUS
@@ -99,12 +99,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
-  * mod_cache: Stop invalidating cached responses when reval returns 304+Expires,
-    trunk patch: http://svn.apache.org/r1518269
-    2.4.x patch: trunk works
-    +1 covener, jim, humbedooh
-
-  
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index 6e644e6754..20360553eb 100644
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -1130,7 +1130,6 @@ static apr_status_t cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
                         "Content-Range")))
                 || ((reason = cache_header_cmp(r->pool, left, right,
                         "Content-Type")))
-                || ((reason = cache_header_cmp(r->pool, left, right, "Expires")))
                 || ((reason = cache_header_cmp(r->pool, left, right, "ETag")))
                 || ((reason = cache_header_cmp(r->pool, left, right,
                         "Last-Modified")))) {