]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1518269 from trunk:
authorJim Jagielski <jim@apache.org>
Tue, 21 Jan 2014 16:55:04 +0000 (16:55 +0000)
committerJim Jagielski <jim@apache.org>
Tue, 21 Jan 2014 16:55:04 +0000 (16:55 +0000)
commit411e718b5eac52bdef46681532046c63a0416ef6
tree2e2f204168a57794f4e1ce66f20af9f3f053ff8f
parentae9d8c36d6f27cc0cefc060a401940d4d58af443
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
STATUS
modules/cache/mod_cache.c