From 09fd4fe240763f57c12e092b99b5cb5e045f02a9 Mon Sep 17 00:00:00 2001 From: Colm MacCarthaigh Date: Tue, 24 Jan 2006 23:03:12 +0000 Subject: [PATCH] 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 --- CHANGES | 3 +++ STATUS | 8 -------- modules/experimental/mod_cache.c | 3 +++ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index ae22fdf8acb..ed78d4d6eb3 100644 --- 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 97d87e98eb9..7127fcf6f0e 100644 --- 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 165a0f4275a..fee82cea2a7 100644 --- 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); -- 2.47.2