1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
$NetBSD: patch-an,v 1.1 2007/06/05 01:43:44 lkundrak Exp $
Security fix for CVE-2007-1862 sensitive information disclosure
http://issues.apache.org/bugzilla/show_bug.cgi?id=41551
http://issues.apache.org/bugzilla/attachment.cgi?id=20065
--- modules/cache/mod_mem_cache.c.orig 2007-06-05 03:31:29.000000000 +0200
+++ modules/cache/mod_mem_cache.c
@@ -539,12 +539,26 @@ static int remove_url(cache_handle_t *h,
return OK;
}
+static apr_table_t *deep_table_copy(apr_pool_t *p, const apr_table_t *table)
+{
+ const apr_array_header_t *array = apr_table_elts(table);
+ apr_table_entry_t *elts = (apr_table_entry_t *) array->elts;
+ apr_table_t *copy = apr_table_make(p, array->nelts);
+ int i;
+
+ for (i = 0; i < array->nelts; i++) {
+ apr_table_add(copy, elts[i].key, elts[i].val);
+ }
+
+ return copy;
+}
+
static apr_status_t recall_headers(cache_handle_t *h, request_rec *r)
{
mem_cache_object_t *mobj = (mem_cache_object_t*) h->cache_obj->vobj;
- h->req_hdrs = apr_table_copy(r->pool, mobj->req_hdrs);
- h->resp_hdrs = apr_table_copy(r->pool, mobj->header_out);
+ h->req_hdrs = deep_table_copy(r->pool, mobj->req_hdrs);
+ h->resp_hdrs = deep_table_copy(r->pool, mobj->header_out);
return OK;
}
@@ -585,7 +599,7 @@ static apr_status_t store_headers(cache_
* - The original response headers (for returning with a cached response)
* - The body of the message
*/
- mobj->req_hdrs = apr_table_copy(mobj->pool, r->headers_in);
+ mobj->req_hdrs = deep_table_copy(mobj->pool, r->headers_in);
/* Precompute how much storage we need to hold the headers */
headers_out = ap_cache_cacheable_hdrs_out(r->pool, r->headers_out,
@@ -599,7 +613,7 @@ static apr_status_t store_headers(cache_
}
headers_out = apr_table_overlay(r->pool, headers_out, r->err_headers_out);
- mobj->header_out = apr_table_copy(mobj->pool, headers_out);
+ mobj->header_out = deep_table_copy(mobj->pool, headers_out);
/* Init the info struct */
obj->info.status = info->status;
|
