svn commit: r126042 - /httpd/httpd/trunk/CHANGES /httpd/httpd/trunk/modules/cache/mod_disk_cache.c

[je...@apache.org]

Author: jerenkrantz
Date: Sat Jan 22 09:59:48 2005
New Revision: 126042

URL: http://svn.apache.org/viewcvs?view=rev&rev=126042
Log:
* modules/cache/mod_disk_cache.c: Cache r->err_headers_out headers.  This
allows CGI scripts to be properly cached.

This issue was pointed out by Sander Striker.

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

Modified: httpd/httpd/trunk/CHANGES
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?view=diff&rev=126042&p1=httpd/httpd/trunk/CHANGES&r1=126041&p2=httpd/httpd/trunk/CHANGES&r2=126042
==============================================================================
--- httpd/httpd/trunk/CHANGES	(original)
+++ httpd/httpd/trunk/CHANGES	Sat Jan 22 09:59:48 2005
@@ -2,6 +2,9 @@
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_disk_cache: Cache r->err_headers_out headers.  This allows CGI
+     scripts to be properly cached.  [Justin Erenkrantz, Sander Striker]
+
   *) mod_ldap: Updated to use the new apr-util v1.1 apr_ldap_*_option()
      API for the setting of server and client SSL certificates. Replaced
      LDAPTrustedCA directive with LDAPTrustedGlobalCert and

Modified: httpd/httpd/trunk/modules/cache/mod_disk_cache.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/mod_disk_cache.c?view=diff&rev=126042&p1=httpd/httpd/trunk/modules/cache/mod_disk_cache.c&r1=126041&p2=httpd/httpd/trunk/modules/cache/mod_disk_cache.c&r2=126042
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_disk_cache.c	(original)
+++ httpd/httpd/trunk/modules/cache/mod_disk_cache.c	Sat Jan 22 09:59:48 2005
@@ -598,6 +598,8 @@
                                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) {
                 return rv;