You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2014/01/21 17:55:04 UTC
svn commit: r1560093 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/cache/mod_cache.c
Author: jim
Date: Tue Jan 21 16:55:04 2014
New Revision: 1560093
URL: http://svn.apache.org/r1560093
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1518269
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1560093&r1=1560092&r2=1560093&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Jan 21 16:55:04 2014
@@ -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 ]
Modified: httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c?rev=1560093&r1=1560092&r2=1560093&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c Tue Jan 21 16:55:04 2014
@@ -1130,7 +1130,6 @@ static apr_status_t cache_save_filter(ap
"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")))) {