* 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.

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

diff --git a/CHANGES b/CHANGES
index 56ac074a7f5a4a40e72d331325796cba4e755a84..b7c892bac5fd0eab502d58e180aa19b838b7f5cb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.3
 
   [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

diff --git a/modules/cache/mod_disk_cache.c b/modules/cache/mod_disk_cache.c
index f05ee7286487c7f66e4108e29780f54a38dc5343..48613b04fc42a20d5b0f79513ec65097db252ff3 100644 (file)
--- a/modules/cache/mod_disk_cache.c
+++ b/modules/cache/mod_disk_cache.c
@@ -598,6 +598,8 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r, cache_info
                                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;