svn commit: r372047 - in /httpd/httpd/branches/2.0.x: CHANGES STATUS modules/experimental/mod_cache.c

[co...@apache.org]

Author: colm
Date: Tue Jan 24 15:03:12 2006
New Revision: 372047

URL: http://svn.apache.org/viewcvs?rev=372047&view=rev
Log:
Merge r220038 from trunk:

* Opps. Use the correct member of the structure.

Submitted by: pquerna

Modified:
    httpd/httpd/branches/2.0.x/CHANGES
    httpd/httpd/branches/2.0.x/STATUS
    httpd/httpd/branches/2.0.x/modules/experimental/mod_cache.c

Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?rev=372047&r1=372046&r2=372047&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Tue Jan 24 15:03:12 2006
@@ -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]    

Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/STATUS?rev=372047&r1=372046&r2=372047&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Tue Jan 24 15:03:12 2006
@@ -138,14 +138,6 @@
                  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

Modified: httpd/httpd/branches/2.0.x/modules/experimental/mod_cache.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/experimental/mod_cache.c?rev=372047&r1=372046&r2=372047&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/experimental/mod_cache.c (original)
+++ httpd/httpd/branches/2.0.x/modules/experimental/mod_cache.c Tue Jan 24 15:03:12 2006
@@ -220,6 +220,9 @@
     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);