apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
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 GMT
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);
 



Mime
View raw message