diff options
author | Cliff Woolley <jwoolley@apache.org> | 2004-10-02 20:03:46 +0000 |
---|---|---|
committer | Cliff Woolley <jwoolley@apache.org> | 2004-10-02 20:03:46 +0000 |
commit | 81dfe8610037127ae19def6eb8e7cbef154d02b9 (patch) | |
tree | 11b9732e6e9741857d6d8c7b523012714b716a0c | |
parent | 01356a36b7e5237e66516de1fcff501f69711923 (diff) | |
download | httpd-81dfe8610037127ae19def6eb8e7cbef154d02b9.tar.gz |
backport from head:
mod_disk_cache: don't store hop-by-hop headers on-disk.
Submitted by: Justin Erenkrantz
Reviewed by: Cliff Woolley, Jeff Trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@105371 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | CHANGES | 2 | ||||
-rw-r--r-- | STATUS | 6 | ||||
-rw-r--r-- | modules/experimental/mod_disk_cache.c | 5 |
3 files changed, 7 insertions, 6 deletions
@@ -1,5 +1,7 @@ Changes with Apache 2.0.53 + *) mod_disk_cache: Do not store hop-by-hop headers. [Justin Erenkrantz] + *) Fix the re-linking issue when purging elements from the LDAP cache PR 24801 [Jess Holle <jessh ptc.com>] @@ -1,5 +1,5 @@ APACHE 2.0 STATUS: -*-text-*- -Last modified at [$Date: 2004/10/02 19:49:22 $] +Last modified at [$Date: 2004/10/02 20:03:43 $] Release: @@ -105,10 +105,6 @@ PATCHES TO BACKPORT FROM 2.1 modules/experimental/mod_mem_cache.c?r1=1.117&r2=1.118 +1: stoddard, jerenkrantz - *) mod_disk_cache: Do not store hop-by-hop headers. - modules/experimental/mod_disk_cache.c?r1=1.65&r2=1.66 - +1: jerenkrantz, jwoolley, trawick - *) mod_rewrite: Fix 0 bytes write into random memory position. PR 31036. (2.0 + 1.3) http://www.apache.org/~nd/dbmmap_1.3.patch diff --git a/modules/experimental/mod_disk_cache.c b/modules/experimental/mod_disk_cache.c index 6e00c0dfec..c5bc592f3f 100644 --- a/modules/experimental/mod_disk_cache.c +++ b/modules/experimental/mod_disk_cache.c @@ -629,7 +629,10 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r, cache_info /* Make call to the same thing cache_select_url calls to crack Vary. */ /* @@@ Some day, not today. */ if (r->headers_in) { - rv = store_table(dobj->hfd, r->headers_in); + apr_table_t *headers_in; + + headers_in = ap_cache_cacheable_hdrs_out(r->pool, r->headers_in); + rv = store_table(dobj->hfd, headers_in); if (rv != APR_SUCCESS) { return rv; } |