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

diff --git a/CHANGES b/CHANGES
index 982b12c5103c9d4e99ae347cbcbb18e51b56b975..fcd8233ca26b86228a88a88533c32d409850fcb4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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>]
       

diff --git a/STATUS b/STATUS
index e3b3f084c077790162e72f4baa48fdadd944be2c..a1e662bc763b9721a154f9be5282c9892804b1c9 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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 6e00c0dfecb70478f2fdb67e2fed5f93449a707a..c5bc592f3f9e0c8a68dad0b59745aedeff5a6360 100644 (file)
--- 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;
             }