diff options
| author | Graham Leggett <minfrin@apache.org> | 2015-09-27 11:33:27 +0000 |
|---|---|---|
| committer | Graham Leggett <minfrin@apache.org> | 2015-09-27 11:33:27 +0000 |
| commit | e20c31224bccf36cda48ef99773bd19f22a52202 (patch) | |
| tree | e56b1b221d14c7161b32fc85a3d798796ce2b298 /modules | |
| parent | 4f90e7483ae9d2a8ad4ccca0e7259c606a346ccd (diff) | |
| download | httpd-e20c31224bccf36cda48ef99773bd19f22a52202.tar.gz | |
mod_cache: r->err_headers_out is not merged into
r->headers when mod_cache is enabled and the response
is cached for the first time.
Submitted by: elu
Reviewed by: ylavic, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705528 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/cache/cache_util.c | 1 | ||||
| -rw-r--r-- | modules/cache/mod_cache.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c index b7454ad6a1..070a5f0d4c 100644 --- a/modules/cache/cache_util.c +++ b/modules/cache/cache_util.c @@ -1254,7 +1254,6 @@ apr_table_t *cache_merge_headers_out(request_rec *r) headers_out = apr_table_overlay(r->pool, r->headers_out, r->err_headers_out); - apr_table_clear(r->err_headers_out); if (r->content_type && !apr_table_get(headers_out, "Content-Type")) { diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c index b95f0a8a5a..091d52706f 100644 --- a/modules/cache/mod_cache.c +++ b/modules/cache/mod_cache.c @@ -1452,6 +1452,7 @@ static apr_status_t cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in) * forward all of them to the client, including non-cacheable ones). */ r->headers_out = cache_merge_headers_out(r); + apr_table_clear(r->err_headers_out); /* Merge in our cached headers. However, keep any updated values. */ /* take output, overlay on top of cached */ |