Commit 21aa92f5 authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

Merge r410370 from trunk: 

* Keep the Content-Type for successfully revalidated
  cached objects, by unsetting possible Content-Type headers in
  r->headers_out and r->err_headers_out as they may be different to what
  we have received from the cache.
  Actually they are not needed as r->content_type set by
  ap_set_content_type a few lines above will be used in the store_headers
  functions of the storage providers as a fallback and the HTTP_HEADER filter
  does overwrite the Content-Type header with r->content_type anyway.

PR: 39647
Submitted by: rpluem
Reviewed by: rpluem, pquerna, fielding


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

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_cache: Do not overwrite the Content-Type in the cache, for









     successfully revalidated cached objects. PR 39647. [Ruediger Pluem]

















  *) mod_speling: Add directive to deal with case corrections only









     and ignore other misspellings [Olivier Thereaux  <ot w3.org>]










































STATUS



+0
−8



























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



Original line number
Diff line number
Diff line







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







       http://issues.apache.org/bugzilla/attachment.cgi?id=18636









       +1: bnicholes, rpluem, fielding



















    * mod_cache: Do not overwrite the Content-Type in the cache, for









      successfully revalidated cached objects. PR 39647.









        Trunk version of patch:









          http://svn.apache.org/viewvc?rev=410370&view=rev









        2.2.x version of patch:









          Trunk version works









      +1: rpluem, pquerna, fielding



















    * mod_authnz_ldap: Fix a problem with invalid auth error detection 









       for LDAP client SDKs that don't support LDAP_SECURITY_ERROR 









       macro. PR#39529


































modules/cache/cache_storage.c



+11
−0



























Changes for modules/cache/cache_storage.c: 11 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -118,6 +118,17 @@ CACHE_DECLARE(void) ap_cache_accept_headers(cache_handle_t *h, request_rec *r,







    if (v) {









        ap_set_content_type(r, v);









        apr_table_unset(h->resp_hdrs, "Content-Type");









        /*









         * Also unset possible Content-Type headers in r->headers_out and









         * r->err_headers_out as they may be different to what we have received









         * from the cache.









         * Actually they are not needed as r->content_type set by









         * ap_set_content_type above will be used in the store_headers functions









         * of the storage providers as a fallback and the HTTP_HEADER filter









         * does overwrite the Content-Type header with r->content_type anyway.









         */









        apr_table_unset(r->headers_out, "Content-Type");









        apr_table_unset(r->err_headers_out, "Content-Type");









    }



















    /* If the cache gave us a Last-Modified header, we can't just