Return-Path: Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 95950 invoked by uid 500); 1 Jan 2002 22:46:49 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 95939 invoked from network); 1 Jan 2002 22:46:49 -0000 Date: 1 Jan 2002 22:46:48 -0000 Message-ID: <20020101224648.70407.qmail@icarus.apache.org> From: striker@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/memory/unix apr_pools.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N striker 02/01/01 14:46:48 Modified: memory/unix apr_pools.c Log: * memory/unix/apr_pools.c (apr_pool_create_ex): Properly inherit abort_fn if NULL is passed. Revision Changes Path 1.125 +3 -0 apr/memory/unix/apr_pools.c Index: apr_pools.c =================================================================== RCS file: /home/cvs/apr/memory/unix/apr_pools.c,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- apr_pools.c 18 Dec 2001 18:55:39 -0000 1.124 +++ apr_pools.c 1 Jan 2002 22:46:48 -0000 1.125 @@ -544,6 +544,9 @@ if (!parent) parent = global_pool; + if (!abort_fn) + abort_fn = parent ? parent->abort_fn : NULL; + allocator = parent ? parent->allocator : &global_allocator; if ((node = node_malloc(allocator, MIN_ALLOC - SIZEOF_NODE_T)) == NULL) { if (abort_fn)