Commit 8bd0207a authored by Graham Leggett's avatar Graham Leggett
Browse files

mod_cache: r->err_headers_out is not merged into 

r->headers when mod_cache is enabled and the response
is cached for the first time.

Submitted by: elu
Reviewed by: ylavic, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705528 13f79535-47bb-0310-9956-ffa450edef68
parent 2deb596f

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 


Changes with Apache 2.4.17



  *) mod_cache: r->err_headers_out is not merged into

     r->headers when mod_cache is enabled and the response

     is cached for the first time. [Edward Lu]



  *) mod_slotmem_shm: Fix slots/SHM files names on restart for systems that

     can't create new (clear) slots while previous children gracefully stopping

     still use the old ones (e.g. Windows, OS2). mod_proxy_balancer failed to

STATUS

+0 −9
Original line number Diff line number Diff line
@@ -109,15 +109,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



   * mod_cache: r->err_headers_out is not merged into

     r->headers when mod_cache is enabled and the response

     is cached for the first time.

     trunk patch: http://svn.apache.org/r1704392

                  http://svn.apache.org/r1704395

     2.4.x patch: trunk works

     +1: elu, ylavic, minfrin

     ylavic: possibly with a CHANGES entry



 



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

modules/cache/cache_util.c

+0 −1
Original line number Diff line number Diff line
@@ -1254,7 +1254,6 @@ apr_table_t *cache_merge_headers_out(request_rec *r) 


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

                                    r->err_headers_out);

    apr_table_clear(r->err_headers_out);



    if (r->content_type

            && !apr_table_get(headers_out, "Content-Type")) {

modules/cache/mod_cache.c

+1 −0
Original line number Diff line number Diff line
@@ -1452,6 +1452,7 @@ static apr_status_t cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in) 
         * forward all of them to the client, including non-cacheable ones).

         */

        r->headers_out = cache_merge_headers_out(r);

        apr_table_clear(r->err_headers_out);



        /* Merge in our cached headers.  However, keep any updated values. */

        /* take output, overlay on top of cached */