Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 12 Apr 2002 22:11:44 -0000
Message-ID: <20020412221144.86709.qmail@icarus.apache.org>
From: bnicholes@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server/mpm/netware mpm_netware.c

bnicholes    02/04/12 15:11:44

  Modified:    server/mpm/netware mpm_netware.c
  Log:
  Readjustment of where the bucket is being allocated now that they are being
  cleaned up.  Need to move the call to after apr_pool_clear() so that it doesn't
  get cleanup too soon and never reallocated.
  
  Revision  Changes    Path
  1.47      +1 -2      httpd-2.0/server/mpm/netware/mpm_netware.c
  
  Index: mpm_netware.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/netware/mpm_netware.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- mpm_netware.c	10 Apr 2002 17:13:32 -0000	1.46
  +++ mpm_netware.c	12 Apr 2002 22:11:44 -0000	1.47
  @@ -376,8 +376,6 @@
       apr_pool_create_ex(&ptrans, NULL, NULL, allocator);
       apr_allocator_set_owner(allocator, ptrans);
   
  -    bucket_alloc = apr_bucket_alloc_create(ptrans);
  -
       apr_pool_tag(ptrans, "transaction");
   
       apr_thread_mutex_lock(worker_thread_count_mutex);
  @@ -393,6 +391,7 @@
           */
           current_conn = NULL;
           apr_pool_clear(ptrans);
  +        bucket_alloc = apr_bucket_alloc_create(ptrans);
   
           if ((ap_max_requests_per_child > 0
               && requests_this_child++ >= ap_max_requests_per_child)) {