summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbnicholes <bnicholes@13f79535-47bb-0310-9956-ffa450edef68>2008-11-25 00:22:04 +0000
committerbnicholes <bnicholes@13f79535-47bb-0310-9956-ffa450edef68>2008-11-25 00:22:04 +0000
commit495edb1844ecb75c14cf6452509c9919eda88f5b (patch)
tree0cfe7f1fb8f4026f63a1254c8f90fe584b9b002d
parent1c5dbc184285f1f1e449255140154bd5b34ad8d4 (diff)
downloadlibapr-util-495edb1844ecb75c14cf6452509c9919eda88f5b.tar.gz
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.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@720364 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--ldap/apr_ldap_stub.c2
-rw-r--r--misc/apu_dso.c7
2 files changed, 7 insertions, 2 deletions
diff --git a/ldap/apr_ldap_stub.c b/ldap/apr_ldap_stub.c
index e4c16729..149b2361 100644
--- a/ldap/apr_ldap_stub.c
+++ b/ldap/apr_ldap_stub.c
@@ -46,7 +46,7 @@ static apr_status_t load_ldap(apr_pool_t *pool)
}
#if defined(NETWARE)
- modname = "aprldap.nlm";
+ modname = "aprlib.nlm";
#elif defined(WIN32)
modname = "apr_ldap-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll";
#else
diff --git a/misc/apu_dso.c b/misc/apu_dso.c
index 83e24569..9ea98175 100644
--- a/misc/apu_dso.c
+++ b/misc/apu_dso.c
@@ -82,7 +82,12 @@ apr_status_t apu_dso_init(apr_pool_t *pool)
/* 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);