diff options
| author | peter <peter@FreeBSD.org> | 2013-11-25 22:20:34 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2013-11-25 22:20:34 +0000 |
| commit | ce675ab4018f54462adad54483c861f607f688c7 (patch) | |
| tree | e570b7d70401fc65aee06a72b02b4ba87c9141b7 /contrib/apr-util/crypto | |
| parent | b9061d4b3d5d7d3aaa3a7c3431088a7a681f91ed (diff) | |
| download | FreeBSD-src-ce675ab4018f54462adad54483c861f607f688c7.zip FreeBSD-src-ce675ab4018f54462adad54483c861f607f688c7.tar.gz | |
Import apr-util-1.5.3 from vendor branch (rr258600)
This is a minor bug fix release.
Diffstat (limited to 'contrib/apr-util/crypto')
| -rw-r--r-- | contrib/apr-util/crypto/apr_crypto.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/apr-util/crypto/apr_crypto.c b/contrib/apr-util/crypto/apr_crypto.c index 7643b94..35ce375 100644 --- a/contrib/apr-util/crypto/apr_crypto.c +++ b/contrib/apr-util/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 |
