Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 29030 invoked from network); 26 Mar 2009 13:06:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 26 Mar 2009 13:06:32 -0000 Received: (qmail 53051 invoked by uid 500); 26 Mar 2009 13:06:32 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 52983 invoked by uid 500); 26 Mar 2009 13:06:32 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 52974 invoked by uid 99); 26 Mar 2009 13:06:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Mar 2009 13:06:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Mar 2009 13:06:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2A94C2388962; Thu, 26 Mar 2009 13:06:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r758619 - /apr/apr/trunk/memory/unix/apr_pools.c Date: Thu, 26 Mar 2009 13:06:09 -0000 To: commits@apr.apache.org From: rpluem@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090326130611.2A94C2388962@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rpluem Date: Thu Mar 26 13:06:05 2009 New Revision: 758619 URL: http://svn.apache.org/viewvc?rev=758619&view=rev Log: * Don't destroy our own pool mutex in apr_pool_clear. Modified: apr/apr/trunk/memory/unix/apr_pools.c Modified: apr/apr/trunk/memory/unix/apr_pools.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/memory/unix/apr_pools.c?rev=758619&r1=758618&r2=758619&view=diff ============================================================================== --- apr/apr/trunk/memory/unix/apr_pools.c (original) +++ apr/apr/trunk/memory/unix/apr_pools.c Thu Mar 26 13:06:05 2009 @@ -511,6 +511,8 @@ #endif /* defined(NETWARE) */ cleanup_t *pre_cleanups; cleanup_t *free_pre_cleanups; + cleanup_t *final_cleanups; + block_list_t *final_blocks; }; #define SIZEOF_POOL_T APR_ALIGN_DEFAULT(sizeof(apr_pool_t)) @@ -780,6 +782,8 @@ } block_list_destroy_all(pool->blocks); + run_cleanups(&pool->final_cleanups); + block_list_destroy_all(pool->final_blocks); free(pool); } @@ -817,6 +821,10 @@ pool->blocks->next = NULL; (void)apr_thread_mutex_create(&pool->mutex, APR_THREAD_MUTEX_NESTED, pool); + pool->final_blocks = pool->blocks; + pool->final_cleanups = pool->cleanups; + pool->blocks = calloc(1, sizeof(block_list_t)); + pool->cleanups = NULL; #ifdef NETWARE