From: Dirk-Willem van Gulik <dirkx@apache.org>
Date: Thu, 17 Apr 2008 16:38:36 +0000 (+0000)
Subject: Centralize hop-by-hop header handling in the memory caching code.
X-Git-Tag: 2.3.0~704
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0701f89d3093947bac89131490690a5189a2ff7a;p=thirdparty%2Fapache%2Fhttpd.git

Centralize hop-by-hop header handling in the memory caching code.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@649178 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/cache/mod_mem_cache.c b/modules/cache/mod_mem_cache.c
index 1c6d6024393..d3e9648af54 100644
--- a/modules/cache/mod_mem_cache.c
+++ b/modules/cache/mod_mem_cache.c
@@ -604,17 +604,8 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r, cache_info
     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,
-                                              r->server);
+    headers_out = ap_cache_cacheable_headers_out(r);
 
-    /* If not set in headers_out, set Content-Type */
-    if (!apr_table_get(headers_out, "Content-Type")
-        && r->content_type) {
-        apr_table_setn(headers_out, "Content-Type",
-                       ap_make_content_type(r, r->content_type));
-    }
-
-    headers_out = apr_table_overlay(r->pool, headers_out, r->err_headers_out);
     mobj->header_out = deep_table_copy(mobj->pool, headers_out);
 
     /* Init the info struct */