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

diff --git a/CHANGES b/CHANGES
index e3219e3cc1408850a3932c8ce01dc7c14fc343cd..cb3ca0556d08bf5def59f32c957c1f9e58e830f6 100644 (file)
--- 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 <triddle_1999 yahoo.com>, Paul Querna <chip force-elite.com>]
 
@@ -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 d09633a69725dd5b3ff783497be76c3e216f7d53..1a9ee86efcc75a4549244897e6510c5483bb4629 100644 (file)
--- 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);