You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by re...@apache.org on 2008/12/18 18:14:54 UTC
svn commit: r727767 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/cache/mod_disk_cache.c modules/cache/mod_mem_cache.c
Author: rederpj
Date: Thu Dec 18 09:14:53 2008
New Revision: 727767
URL: http://svn.apache.org/viewvc?rev=727767&view=rev
Log:
Commit promoted backport of PR46401
*) mod_cache: Correctly save Content-Encoding of cachable entity. PR 46401
[Dan Poirier <poirier pobox.com>]
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/cache/mod_disk_cache.c
httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=727767&r1=727766&r2=727767&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Thu Dec 18 09:14:53 2008
@@ -1,6 +1,9 @@
-*- 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>]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=727767&r1=727766&r2=727767&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Dec 18 09:14:53 2008
@@ -86,14 +86,6 @@
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>]
Modified: httpd/httpd/branches/2.2.x/modules/cache/mod_disk_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/cache/mod_disk_cache.c?rev=727767&r1=727766&r2=727767&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/cache/mod_disk_cache.c (original)
+++ httpd/httpd/branches/2.2.x/modules/cache/mod_disk_cache.c Thu Dec 18 09:14:53 2008
@@ -916,6 +916,12 @@
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);
Modified: httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c?rev=727767&r1=727766&r2=727767&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c (original)
+++ httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c Thu Dec 18 09:14:53 2008
@@ -614,6 +614,12 @@
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);