From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 29 Apr 2014 23:28:11 +0000 (+0000)
Subject: mod_cache: Retry unconditional request with the full URL (including the
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a1c11f7b7a3da2168509520eed4778a65d4e922;p=thirdparty%2Fapache%2Fhttpd.git

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1591143 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index c803a14598d..9a1b0c0ce48 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) 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_authnz_ldap: Fail explicitly when the filter is too long. Remove
      unnecessary apr_pstrdup() and strlen(). [Graham Leggett]
 
diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index a634b948ed3..af8889a8921 100644
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -1200,7 +1200,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;
     }