Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1373115 - in /httpd/httpd/branches/2.4.x: ./ CHANGES
 STATUS
 modules/cache/mod_cache.c
Date: Tue, 14 Aug 2012 21:14:34 -0000
To: cvs@httpd.apache.org
From: jim@apache.org
Message-Id: <20120814211435.0AF342388962@eris.apache.org>

Author: jim
Date: Tue Aug 14 21:14:34 2012
New Revision: 1373115

URL: http://svn.apache.org/viewvc?rev=1373115&view=rev
Log:
Editors choice on CHANGES

Merge r1361153 from trunk:

* Set content type in case we return stale content.
Submitted by: rpluem
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1361153

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1373115&r1=1373114&r2=1373115&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Aug 14 21:14:34 2012
@@ -7,6 +7,9 @@ Changes with Apache 2.4.3
      possible XSS for a site where untrusted users can upload files to
      a location with MultiViews enabled. [Niels Heinen <heinenn google.com>]
 
+  *) mod_cache: Set content type in case we return stale content.
+     [Ruediger Pluem]
+
   *) Windows: Fix SSL failures on windows with AcceptFilter https none.
      PR: 52476.  [Jeff Trawick]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1373115&r1=1373114&r2=1373115&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Aug 14 21:14:34 2012
@@ -88,11 +88,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_cache: Set content type in case we return stale content.
-     trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1361153
-     2.4.x patch: trunk patch works
-     +1: rjung, humbedooh, trawick (needs CHANGES entry)
-     -0: What should CHANGES say???
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

Modified: httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c?rev=1373115&r1=1373114&r2=1373115&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c Tue Aug 14 21:14:34 2012
@@ -1655,6 +1655,9 @@ static void cache_insert_error_filter(re
 
             r->err_headers_out = cache->stale_handle->resp_hdrs;
 
+            ap_set_content_type(r, apr_table_get(
+                                cache->stale_handle->resp_hdrs, "Content-Type"));
+
             /* add a revalidation warning */
             warn_head = apr_table_get(r->err_headers_out, "Warning");
             if ((warn_head == NULL) || ((warn_head != NULL)