Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 60738 invoked from network); 25 Nov 2008 00:22:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Nov 2008 00:22:56 -0000 Received: (qmail 74108 invoked by uid 500); 25 Nov 2008 00:23:06 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 74060 invoked by uid 500); 25 Nov 2008 00:23:06 -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 74051 invoked by uid 99); 25 Nov 2008 00:23:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Nov 2008 16:23:06 -0800 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; Tue, 25 Nov 2008 00:21:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8254C238898E; Mon, 24 Nov 2008 16:22:05 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r720364 - in /apr/apr-util/trunk: ldap/apr_ldap_stub.c misc/apu_dso.c Date: Tue, 25 Nov 2008 00:22:05 -0000 To: commits@apr.apache.org From: bnicholes@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081125002205.8254C238898E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bnicholes Date: Mon Nov 24 16:22:04 2008 New Revision: 720364 URL: http://svn.apache.org/viewvc?rev=720364&view=rev Log: Fix apu_dso_load() for netware. Make sure that the search for the apr global memory pool doesn't search forever since netware doesn't have a single global memory pool per process. Modified: apr/apr-util/trunk/ldap/apr_ldap_stub.c apr/apr-util/trunk/misc/apu_dso.c Modified: apr/apr-util/trunk/ldap/apr_ldap_stub.c URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/ldap/apr_ldap_stub.c?rev=720364&r1=720363&r2=720364&view=diff ============================================================================== --- apr/apr-util/trunk/ldap/apr_ldap_stub.c (original) +++ apr/apr-util/trunk/ldap/apr_ldap_stub.c Mon Nov 24 16:22:04 2008 @@ -46,7 +46,7 @@ } #if defined(NETWARE) - modname = "aprldap.nlm"; + modname = "aprlib.nlm"; #elif defined(WIN32) modname = "apr_ldap-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll"; #else Modified: apr/apr-util/trunk/misc/apu_dso.c URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/misc/apu_dso.c?rev=720364&r1=720363&r2=720364&view=diff ============================================================================== --- apr/apr-util/trunk/misc/apu_dso.c (original) +++ apr/apr-util/trunk/misc/apu_dso.c Mon Nov 24 16:22:04 2008 @@ -82,7 +82,12 @@ /* Top level pool scope, need process-scope lifetime */ for (parent = global = pool; parent; parent = apr_pool_parent_get(global)) - global = parent; +#ifdef NETWARE + if (parent == global) { + break; + } +#endif + global = parent; dsos = apr_hash_make(global);