diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2013-11-25 22:15:47 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2013-11-25 22:15:47 +0000 |
| commit | 5bf7090be49a8f79350e8a04ecf260984cb126cf (patch) | |
| tree | b888b0286fddebe26a2a96112de741138b72924f /crypto | |
| parent | d08b300705ff687948b1a2b89543e3a452e90c32 (diff) | |
Import apr-util 1.5.3vendor/apr-util/apr-util-1.5.3
Notes
svn path=/vendor/apr-util/dist/; revision=258600
svn path=/vendor/apr-util/apr-util-1.5.3/; revision=258601; tag=vendor/apr-util/apr-util-1.5.3
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/apr_crypto.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/apr_crypto.c b/crypto/apr_crypto.c index 7643b94e1596..35ce3752a9b7 100644 --- a/crypto/apr_crypto.c +++ b/crypto/apr_crypto.c @@ -100,7 +100,9 @@ APU_DECLARE(apr_status_t) apr_crypto_init(apr_pool_t *pool) } /* Top level pool scope, need process-scope lifetime */ - for (parent = pool; parent; parent = apr_pool_parent_get(pool)) + for (parent = apr_pool_parent_get(pool); + parent && parent != pool; + parent = apr_pool_parent_get(pool)) pool = parent; #if APU_DSO_BUILD /* deprecate in 2.0 - permit implicit initialization */ @@ -176,7 +178,7 @@ APU_DECLARE(apr_status_t) apr_crypto_get_driver( #if defined(NETWARE) apr_snprintf(modname, sizeof(modname), "crypto%s.nlm", name); -#elif defined(WIN32) +#elif defined(WIN32) || defined(__CYGWIN__) apr_snprintf(modname, sizeof(modname), "apr_crypto_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", name); #else |