From: Eric Covener <covener@apache.org>
Date: Wed, 28 Aug 2013 16:07:50 +0000 (+0000)
Subject: Expires in a 304 is not a contradiction in terms of r1487118:
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa30ab4caea3050fee88457e56aad65fecdcfa57;p=thirdparty%2Fapache%2Fhttpd.git

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




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

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index a5dd439f271..969c231fc5a 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")))) {