minfrin 2004/10/13 09:32:06
Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS
modules/experimental Tag: APACHE_2_0_BRANCH mod_disk_cache.c
Log:
Correctly store cache content type.
PR: 30278
Submitted by: [Rüiger Plü <r.pluem t-online.de>]
Reviewed by: stoddard, jerenkrantz, minfrin, jim
Revision Changes Path
No revision
No revision
1.988.2.368 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.367
retrieving revision 1.988.2.368
diff -u -r1.988.2.367 -r1.988.2.368
--- CHANGES 13 Oct 2004 16:19:33 -0000 1.988.2.367
+++ CHANGES 13 Oct 2004 16:32:03 -0000 1.988.2.368
@@ -1,5 +1,8 @@
Changes with Apache 2.0.53
+ *) mod_disk_cache: Correctly store cached content type. PR 30278.
+ [Rüiger Plü <r.pluem t-online.de>]
+
*) mod_ldap: prevent the possiblity of an infinite loop in the LDAP
statistics display. PR 29216 [Graham Leggett]
1.751.2.1114 +1 -5 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.1113
retrieving revision 1.751.2.1114
diff -u -r1.751.2.1113 -r1.751.2.1114
--- STATUS 13 Oct 2004 16:19:34 -0000 1.751.2.1113
+++ STATUS 13 Oct 2004 16:32:05 -0000 1.751.2.1114
@@ -115,10 +115,6 @@
jorton replies: it does indeed, hang on...
+1: jorton
- *) Correctly store cache content type. PR 30278
- modules/experimental/mod_disk_cache.c?r1=1.62&r2=1.63
- +1: stoddard, jerenkrantz, minfrin, jim
-
*) Do not store aborted content. PR 21492.
modules/experimental/mod_disk_cache.c?r1=1.63&r2=1.64
+1: stoddard, jerenkrantz, minfrin, jim
No revision
No revision
1.45.2.10 +6 -5 httpd-2.0/modules/experimental/mod_disk_cache.c
Index: mod_disk_cache.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_disk_cache.c,v
retrieving revision 1.45.2.9
retrieving revision 1.45.2.10
diff -u -r1.45.2.9 -r1.45.2.10
--- mod_disk_cache.c 2 Oct 2004 20:03:46 -0000 1.45.2.9
+++ mod_disk_cache.c 13 Oct 2004 16:32:06 -0000 1.45.2.10
@@ -613,16 +613,17 @@
headers_out = ap_cache_cacheable_hdrs_out(r->pool, r->headers_out);
+ 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));
+ }
+
rv = store_table(dobj->hfd, headers_out);
if (rv != APR_SUCCESS) {
return rv;
}
- /* This case only occurs when the content is generated locally */
- if (!apr_table_get(r->headers_out, "Content-Type") && r->content_type)
{
- apr_table_setn(r->headers_out, "Content-Type",
- ap_make_content_type(r, r->content_type));
- }
}
/* Parse the vary header and dump those fields from the headers_in. */
|