Merge r220038 from trunk:

* Opps. Use the correct member of the structure.

Submitted by: pquerna

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

diff --git a/CHANGES b/CHANGES
index ae22fdf8acbf79902528d0b16e96ac8c8b845876..ed78d4d6eb375b58bbaa4e36b60ec07dbdd44fcf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.0.56
 
+  *) mod_cache: Correctly handle responses with a 301 status. PR 37347. 
+     [Paul Querna]
+
   *) mod_proxy_http: Prevent data corruption of POST request bodies when
      client accesses proxied resources with SSL. PR 37145.
      [Ruediger Pluem, William Rowe]    

diff --git a/STATUS b/STATUS
index 97d87e98eb9b7fe5977f9fbe3027a713d85e99b9..7127fcf6f0e69e89caa48d7670f62ea94964b404 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -138,14 +138,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                  as well.
          colm:   another +1 on the later patch too.
 
-    *) mod_cache: Fix PR37347
-       (mod_disk_cache replaces HTTP Status 301 with 200)
-       Trunk version of patch:
-          http://svn.apache.org/viewcvs.cgi?rev=220038&view=rev
-       Backport version for 2.0.x of patch:
-          http://issues.apache.org/bugzilla/attachment.cgi?id=16870
-       +1: rpluem, colm, jim
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
     identify exactly what the proposed changes are!  Add all new

diff --git a/modules/experimental/mod_cache.c b/modules/experimental/mod_cache.c
index 165a0f4275a8657b6efd9af51f9dd42d35153645..fee82cea2a71f12e456f2c8ff1c59af3ff8728df 100644 (file)
--- a/modules/experimental/mod_cache.c
+++ b/modules/experimental/mod_cache.c
@@ -220,6 +220,9 @@ static int cache_out_filter(ap_filter_t *f, apr_bucket_brigade *bb)
     ap_log_error(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, r->server,
                  "cache: running CACHE_OUT filter");
 
+    /* restore status of cached response */
+    r->status = cache->handle->status;
+
     /* recall_headers() was called in cache_select_url() */
     cache->provider->recall_body(cache->handle, r->pool, bb);