Commit c5002315 authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

Merge r399388 from trunk: 

* Add Content-Type to headers_out if not already set. This ensures that
  the Content-Type of the cached entity gets restored correctly.

PR: 39266

Submitted by: rpluem
Reviewed by: rpluem, trawick, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@410932 13f79535-47bb-0310-9956-ffa450edef68
parent 0937bbd7

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                        -*- coding: utf-8 -*-

Changes with Apache 2.2.3









  *) mod_mem_cache: Set content type correctly when delivering data from









     cache. PR 39266. [Ruediger Pluem]

















  *) mod_autoindex: Fix filename escaping with FancyIndexing disabled.









     PR 38910.  [Robby Griffin <rmg terc.edu>]










































STATUS



+0
−8



























Changes for STATUS: 0 added lines, 8 removed lines.



Original line number
Diff line number
Diff line







@@ -90,14 +90,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:







      2.2.x (identical)









      +1: niq, trawick, rpluem



















    * mod_mem_cache: Add Content-Type to headers_out if not already set.









      PR 39266.









        Trunk version of patch:









          http://svn.apache.org/viewcvs?rev=399388&view=rev









        2.2.x version of patch:









          Trunk version works









      +1 rpluem, trawick, jim



















PATCHES PROPOSED TO BACKPORT FROM TRUNK:



















    * Add optional 'scheme://' part to ServerName directive for cases


































modules/cache/mod_mem_cache.c



+8
−0



























Changes for modules/cache/mod_mem_cache.c: 8 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -689,6 +689,14 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r, cache_info







    /* Precompute how much storage we need to hold the headers */









    headers_out = ap_cache_cacheable_hdrs_out(r->pool, r->headers_out,









                                              r->server);



















    /* If not set in headers_out, set Content-Type */









    if (!apr_table_get(headers_out, "Content-Type")









        && r->content_type) {









        apr_table_setn(headers_out, "Content-Type",









                       ap_make_content_type(r, r->content_type));









    }



















    headers_out = apr_table_overlay(r->pool, headers_out, r->err_headers_out);



















    rc = serialize_table(&mobj->header_out, &mobj->num_header_out,