From ee818fd08c7203e36697ef94a2e5244d1c345b87 Mon Sep 17 00:00:00 2001 From: Bill Stoddard Date: Thu, 11 Dec 2003 02:10:29 +0000 Subject: [PATCH] Win32: Tweak MaxMemFree patch. Allocate ptrans specifying pchild as the parent pool as we did prior to the MaxMemFree patch. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102025 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 6 +++--- server/mpm/winnt/child.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index e3219e3cc1..cb3ca0556d 100644 --- a/CHANGES +++ b/CHANGES @@ -36,9 +36,6 @@ Changes with Apache 2.1.0-dev *) mod_logio: Account for some bytes handed to the network layer prior to dropped connections. [Jeff Trawick] - *) Win32 MPM: The bucket brigades subsystem now honors the MaxMemFree setting. - [Bill Stoddard] - *) mod_autoindex: new directive IndexStyleSheet [Tyler Riddle , Paul Querna ] @@ -256,6 +253,9 @@ Changes with Apache 2.1.0-dev Apache 2.0.xx tree as documented, and except as noted, below.] Changes with Apache 2.0.49 + *) Win32 MPM: Implement MaxMemFree to enable setting an upper + limit on the amount of storage used by the bucket brigades + in each server thread. [Bill Stoddard] *) Modified the cache code to be header-location agnostic. Also fixed a number of other cache code bugs related to PR 15852. diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c index d09633a697..1a9ee86efc 100644 --- a/server/mpm/winnt/child.c +++ b/server/mpm/winnt/child.c @@ -200,7 +200,7 @@ AP_DECLARE(PCOMP_CONTEXT) mpm_get_completion_context(void) /* Create the tranaction pool */ apr_allocator_create(&allocator); apr_allocator_max_free_set(allocator, ap_max_mem_free); - rv = apr_pool_create_ex(&context->ptrans, NULL, NULL, allocator); + rv = apr_pool_create_ex(&context->ptrans, pchild, NULL, allocator); if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK,APLOG_WARNING, rv, ap_server_conf, "mpm_get_completion_context: Failed to create the transaction pool."); @@ -447,7 +447,7 @@ static PCOMP_CONTEXT win9x_get_connection(PCOMP_CONTEXT context) context = apr_pcalloc(pchild, sizeof(COMP_CONTEXT)); apr_allocator_create(&allocator); apr_allocator_max_free_set(allocator, ap_max_mem_free); - apr_pool_create_ex(&context->ptrans, NULL, NULL, allocator); + apr_pool_create_ex(&context->ptrans, pchild, NULL, allocator); apr_allocator_owner_set(allocator, context->ptrans); apr_pool_tag(context->ptrans, "transaction"); context->ba = apr_bucket_alloc_create(pchild); -- 2.40.0