From b47b0f07417f2cc290a9bfbe0022db7b29bab7e9 Mon Sep 17 00:00:00 2001 From: Brian Pane Date: Wed, 25 Sep 2002 07:08:45 +0000 Subject: [PATCH] Fix the per-server config merge function in mod_cache to properly inherit CacheMaxStreamingBuffer PR: Obtained from: Matthieu Estrade Reviewed by: Brian Pane git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96972 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ modules/experimental/mod_cache.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/CHANGES b/CHANGES index a082636269..f6454f4348 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,9 @@ Changes with Apache 2.0.43 + *) Make mod_cache's CacheMaxStreamingBuffer directive work + properly for virtual hosts that override server-wide mod_cache + setttings. [Matthieu Estrade ] + *) Add ap_register_provider/ap_lookup_provider API. [John K. Sterling , Justin Erenkrantz] diff --git a/modules/experimental/mod_cache.c b/modules/experimental/mod_cache.c index fcbb6676e2..78d34c04c3 100644 --- a/modules/experimental/mod_cache.c +++ b/modules/experimental/mod_cache.c @@ -919,6 +919,10 @@ static void * merge_cache_config(apr_pool_t *p, void *basev, void *overridesv) (overrides->ignorecachecontrol_set == 0) ? base->ignorecachecontrol : overrides->ignorecachecontrol; + ps->max_streaming_buffer_size = + (overrides->max_streaming_buffer_size == 0) + ? base->max_streaming_buffer_size + : overrides->max_streaming_buffer_size; return ps; } -- 2.40.0