Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7B943F647 for ; Tue, 7 May 2013 10:56:34 +0000 (UTC) Received: (qmail 97445 invoked by uid 500); 7 May 2013 10:56:34 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 97298 invoked by uid 500); 7 May 2013 10:56: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 97278 invoked by uid 99); 7 May 2013 10:56:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 May 2013 10:56:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Tue, 07 May 2013 10:56:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 742E62388962; Tue, 7 May 2013 10:56:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1479853 - /apr/apr/trunk/util-misc/apu_dso.c Date: Tue, 07 May 2013 10:56:08 -0000 To: commits@apr.apache.org From: fuankg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130507105608.742E62388962@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fuankg Date: Tue May 7 10:56:08 2013 New Revision: 1479853 URL: http://svn.apache.org/r1479853 Log: Followup fix for incomplete patch with r1479836. Modified: apr/apr/trunk/util-misc/apu_dso.c Modified: apr/apr/trunk/util-misc/apu_dso.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/util-misc/apu_dso.c?rev=1479853&r1=1479852&r2=1479853&view=diff ============================================================================== --- apr/apr/trunk/util-misc/apu_dso.c (original) +++ apr/apr/trunk/util-misc/apu_dso.c Tue May 7 10:56:08 2013 @@ -73,7 +73,6 @@ static apr_status_t apu_dso_term(void *p apr_status_t apu_dso_init(apr_pool_t *pool) { apr_status_t ret = APR_SUCCESS; - apr_pool_t *global; apr_pool_t *parent; if (apr_atomic_inc32(&initialised)) { @@ -91,14 +90,14 @@ apr_status_t apu_dso_init(apr_pool_t *po parent = apr_pool_parent_get(pool)) pool = parent; - dsos = apr_hash_make(global); + dsos = apr_hash_make(pool); #if APR_HAS_THREADS - ret = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, global); + ret = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, pool); /* This already registers a pool cleanup */ #endif - apr_pool_cleanup_register(global, NULL, apu_dso_term, + apr_pool_cleanup_register(pool, NULL, apu_dso_term, apr_pool_cleanup_null); apr_atomic_dec32(&in_init);