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/05/19 16:52:21 UTC
svn commit: r1595917 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
modules/cache/mod_cache.c
Author: jim
Date: Mon May 19 14:52:20 2014
New Revision: 1595917
URL: http://svn.apache.org/r1595917
Log:
Merge r1591143 from trunk:
mod_cache: Retry unconditional request with the full URL (including the
query-string) when the origin server's 304 response does not
match the conditions used to revalidate the stale entry.
http://www.mail-archive.com/dev@httpd.apache.org/msg59884.html
Submitted by: ylavic
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:r1591143
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1595917&r1=1595916&r2=1595917&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon May 19 14:52:20 2014
@@ -2,6 +2,10 @@
Changes with Apache 2.4.10
+ *) mod_cache: Retry unconditional request with the full URL (including the
+ query-string) when the origin server's 304 response does not match the
+ conditions used to revalidate the stale entry. [Yann Ylavic].
+
*) mod_alias: Stop setting CONTEXT_PREFIX and CONTEXT_DOCUMENT environment
variables as a result of AliasMatch. [Eric Covener]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1595917&r1=1595916&r2=1595917&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon May 19 14:52:20 2014
@@ -100,13 +100,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_cache: Retry unconditional request with the full URL (including the
- query-string) when the origin server's 304 response does not match the
- conditions used to revalidate the stale entry. [Yann Ylavic].
- trunk patch: http://svn.apache.org/r1591143
- 2.4.x patch: trunk works (modulo CHANGES)
- +1: minfrin, trawick, ylavic
-
* mod_socache_shmcb: Correct counting of expirations for status display.
Expirations happening during retrieval were not counted.
trunk patch: http://svn.apache.org/r1595426
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=1595917&r1=1595916&r2=1595917&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 Mon May 19 14:52:20 2014
@@ -1201,7 +1201,7 @@ 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");
- ap_internal_redirect(r->uri, r);
+ ap_internal_redirect(r->unparsed_uri, r);
return APR_SUCCESS;
}