Fix the per-server config merge function in mod_cache to

properly inherit CacheMaxStreamingBuffer
PR:
Obtained from:  Matthieu Estrade <estrade-m@ifrance.com>
Reviewed by:	Brian Pane

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

diff --git a/CHANGES b/CHANGES
index a0826362691bad3f20928653619e6f848276544d..f6454f4348238701a9887369289de45db4904e2c 100644 (file)
--- 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 <estrade-m@ifrance.com>]
+
   *) Add ap_register_provider/ap_lookup_provider API.
      [John K. Sterling <john@sterls.com>, Justin Erenkrantz]
 

diff --git a/modules/experimental/mod_cache.c b/modules/experimental/mod_cache.c
index fcbb6676e26aeeb2e00a8590c23a8496794c1de0..78d34c04c317054794623bf9d3940ff477ac8b79 100644 (file)
--- 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;
 }