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 ed3879ac2880bae1af73c2dde69ae211ff8be4f7..bd28fe9b47f99dca46d353bebd34bf7953c31812 100644 (file)
--- 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 6e644e6754dae0e01868e47516b752bde016c7f2..20360553ebf0dbb8473fad22e030809a54d361df 100644 (file)
--- 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")))) {