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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1595917 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 25bd5f6a0a328bc3ad7a82e13bd9598d7a5c9ea0..aa74d02f6272fc3efdef171db85326d177758a82 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
  

diff --git a/STATUS b/STATUS
index 0191d01c6c373d6413cb144f5595e8592d4c9ce9..3ed5f48ba73a813a16ef9bfe1fcb6c04f7363818 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index eb446399226c9f01350fbb9d19ef8d1852c4e32c..8763078cebde0c334ec2a898ac51d05dad8d5056 100644 (file)
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -1201,7 +1201,7 @@ static apr_status_t cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
         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;
     }