From a0561f4c05262e53f4cc6b9a08a677a5d8b561c0 Mon Sep 17 00:00:00 2001 From: Dirk-Willem van Gulik Date: Thu, 17 Apr 2008 16:37:24 +0000 Subject: [PATCH] Centralize hop-by-hop header handling in the disk caching code. Note that 'out' now has actual out semantics; hence the change in headers_in. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@649176 13f79535-47bb-0310-9956-ffa450edef68 --- modules/cache/mod_disk_cache.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/modules/cache/mod_disk_cache.c b/modules/cache/mod_disk_cache.c index c1c1af6cdd..771ba930d6 100644 --- a/modules/cache/mod_disk_cache.c +++ b/modules/cache/mod_disk_cache.c @@ -937,17 +937,8 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r, cache_info if (r->headers_out) { apr_table_t *headers_out; - headers_out = ap_cache_cacheable_hdrs_out(r->pool, r->headers_out, - r->server); + headers_out = ap_cache_cacheable_headers_out(r); - 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); rv = store_table(dobj->hfd, headers_out); if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_WARNING, rv, r->server, @@ -962,8 +953,8 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r, cache_info if (r->headers_in) { apr_table_t *headers_in; - headers_in = ap_cache_cacheable_hdrs_out(r->pool, r->headers_in, - r->server); + headers_in = ap_cache_cacheable_headers_in(r); + rv = store_table(dobj->hfd, headers_in); if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_WARNING, rv, r->server, -- 2.40.0