httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/winnt child.c
Date Thu, 11 Dec 2003 02:10:29 GMT
stoddard    2003/12/10 18:10:29

  Modified:    .        CHANGES
               server/mpm/winnt child.c
  Log:
  Win32: Tweak MaxMemFree patch. Allocate ptrans specifying pchild
  as the parent pool as we did prior to the MaxMemFree patch.
  
  Revision  Changes    Path
  1.1340    +3 -3      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1339
  retrieving revision 1.1340
  diff -u -r1.1339 -r1.1340
  --- CHANGES	10 Dec 2003 22:40:33 -0000	1.1339
  +++ CHANGES	11 Dec 2003 02:10:29 -0000	1.1340
  @@ -36,9 +36,6 @@
     *) 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 @@
      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.
  
  
  
  1.18      +2 -2      httpd-2.0/server/mpm/winnt/child.c
  
  Index: child.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/child.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- child.c	20 Nov 2003 19:44:18 -0000	1.17
  +++ child.c	11 Dec 2003 02:10:29 -0000	1.18
  @@ -200,7 +200,7 @@
                   /* 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 @@
           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);
  
  
  

Mime
View raw message