httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From di...@apache.org
Subject svn commit: r649176 - /httpd/httpd/trunk/modules/cache/mod_disk_cache.c
Date Thu, 17 Apr 2008 16:37:31 GMT
Author: dirkx
Date: Thu Apr 17 09:37:24 2008
New Revision: 649176

URL: http://svn.apache.org/viewvc?rev=649176&view=rev
Log:
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.

Modified:
    httpd/httpd/trunk/modules/cache/mod_disk_cache.c

Modified: httpd/httpd/trunk/modules/cache/mod_disk_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_disk_cache.c?rev=649176&r1=649175&r2=649176&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_disk_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_disk_cache.c Thu Apr 17 09:37:24 2008
@@ -937,17 +937,8 @@
     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 @@
     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,



Mime
View raw message