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/09/26 12:57:50 UTC
svn commit: r1627745 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
modules/cache/mod_cache.c
Author: jim
Date: Fri Sep 26 10:57:50 2014
New Revision: 1627745
URL: http://svn.apache.org/r1627745
Log:
Merge r1619835, r1620461 from trunk:
don't let handlers start with r->status = 304 during a failed revalidation
PR56881
Fix typo in comment.
Submitted by: covener, rjung
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
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:r1619835,1620461
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1627745&r1=1627744&r2=1627745&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Fri Sep 26 10:57:50 2014
@@ -2,6 +2,9 @@
Changes with Apache 2.4.11
+ *) mod_cache: Avoid sending 304 responses during failed revalidations
+ PR56881. [Eric Covener]
+
*) mod_status: Honor client IP address using mod_remoteip. PR 55886.
[Jim Jagielski]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1627745&r1=1627744&r2=1627745&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Fri Sep 26 10:57:50 2014
@@ -102,13 +102,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_cache: Avoid sending a 304 to an unconditional request during a
- revalidation. PR56881
- trunk patch: http://svn.apache.org/r1619835
- http://svn.apache.org/r1620461
- 2.4.x patch: trunk works
- +1: covener, jim, ylavic
-
* core: Add missing va_end spotted by cppcheck
various: Silent some cppcheck warnings
trunk patch: http://svn.apache.org/r1619297
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=1627745&r1=1627744&r2=1627745&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 Fri Sep 26 10:57:50 2014
@@ -1201,6 +1201,8 @@ static apr_status_t cache_save_filter(ap
apr_table_unset(r->headers_in, "If-Range");
apr_table_unset(r->headers_in, "If-Unmodified-Since");
+ /* Currently HTTP_NOT_MODIFIED, and after the redirect, handlers won't think to set status to HTTP_OK */
+ r->status = HTTP_OK;
ap_internal_redirect(r->unparsed_uri, r);
return APR_SUCCESS;