Commit 67a9eb7a authored by Paul J. Reder's avatar Paul J. Reder
Browse files

Commit promoted backport of PR46401 

 *) mod_cache: Correctly save Content-Encoding of cachable entity. PR 46401
    [Dan Poirier <poirier pobox.com>]


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

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.12



  *) mod_cache: Correctly save Content-Encoding of cachable entity. PR 46401

     [Dan Poirier <poirier pobox.com>]



  *) Output -M and -S dumps (modules and vhosts) to stdout instead of stderr.

     PR 42571 and PR 44266 (dup).  [Dan Poirier <poirier pobox.com>]

STATUS

+0 −8
Changes for STATUS: 0 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -86,14 +86,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

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



 * mod_cache: Correctly save Content-Encoding of cachable entity. PR 46401

   [Dan Poirier <poirier pobox.com>]

   Trunk version of patch (committed by rpluem):

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

   Backport version of patch:

      http://people.apache.org/~rederpj/backport_PR46401_cache_Content-Encoding.diff

   +1: rederpj, rpluem, covener 



 * mod_ldap: Avoid a segfault when result->rc is checked in uldap_connection_init

   when result is NULL. This could happen if LDAP initialization failed.

   PR 45994.  [Dan Poirier <poirier pobox.com>]

modules/cache/mod_disk_cache.c

+6 −0
Changes for modules/cache/mod_disk_cache.c: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -916,6 +916,12 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r, cache_info 
                           ap_make_content_type(r, r->content_type));

        }



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

            && r->content_encoding) {

            apr_table_setn(headers_out, "Content-Encoding",

                           r->content_encoding);

        }



        headers_out = apr_table_overlay(r->pool, headers_out,

                                        r->err_headers_out);

        rv = store_table(dobj->hfd, headers_out);

modules/cache/mod_mem_cache.c

+6 −0
Changes for modules/cache/mod_mem_cache.c: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -614,6 +614,12 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r, cache_info 
                       ap_make_content_type(r, r->content_type));

    }



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

        && r->content_encoding) {

        apr_table_setn(headers_out, "Content-Encoding",

                       r->content_encoding);

    }



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

    mobj->header_out = deep_table_copy(mobj->pool, headers_out);