Merge r1361153 from trunk:
* Set content type in case we return stale content.
Submitted by: rpluem
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1373115 13f79535-47bb-0310-9956-
ffa450edef68
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]
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 ]
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)