1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00

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
This commit is contained in:
Brian Pane
2002-09-25 07:08:45 +00:00
parent 491919f718
commit b47b0f0741
2 changed files with 8 additions and 0 deletions

View File

@@ -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]

View File

@@ -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;
}