diff options
| author | Guenter Knauf <fuankg@apache.org> | 2013-05-07 10:56:08 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2013-05-07 10:56:08 +0000 |
| commit | d54e3624e5829c7addb7d5c79208290bc80dc0f0 (patch) | |
| tree | 3caaf7effb5095a0672af88e38a5ed938a54e6ef /util-misc | |
| parent | 434de362c58c4ce3c3dc5d75b271c8af54c85e72 (diff) | |
| download | apr-d54e3624e5829c7addb7d5c79208290bc80dc0f0.tar.gz | |
Followup fix for incomplete patch with r1479836.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1479853 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'util-misc')
| -rw-r--r-- | util-misc/apu_dso.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/util-misc/apu_dso.c b/util-misc/apu_dso.c index b711066d3..909af706d 100644 --- a/util-misc/apu_dso.c +++ b/util-misc/apu_dso.c @@ -73,7 +73,6 @@ static apr_status_t apu_dso_term(void *ptr) apr_status_t apu_dso_init(apr_pool_t *pool) { apr_status_t ret = APR_SUCCESS; - apr_pool_t *global; apr_pool_t *parent; if (apr_atomic_inc32(&initialised)) { @@ -91,14 +90,14 @@ apr_status_t apu_dso_init(apr_pool_t *pool) parent = apr_pool_parent_get(pool)) pool = parent; - dsos = apr_hash_make(global); + dsos = apr_hash_make(pool); #if APR_HAS_THREADS - ret = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, global); + ret = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, pool); /* This already registers a pool cleanup */ #endif - apr_pool_cleanup_register(global, NULL, apu_dso_term, + apr_pool_cleanup_register(pool, NULL, apu_dso_term, apr_pool_cleanup_null); apr_atomic_dec32(&in_init); |