diff options
| author | peter <peter@FreeBSD.org> | 2013-07-28 06:02:40 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2013-07-28 06:02:40 +0000 |
| commit | 0aadc82afbae4dbc41da86cd4f9b2ceb8ddcb17d (patch) | |
| tree | 6a96e078c28ea05d418b4e2722bc03b0b930a78b /contrib/apr-util/misc | |
| parent | 7594fa5c70305cda65deedc5cc7e08dc037727cd (diff) | |
| parent | b910f82d487cf989800adbd1a65b3a7f71b46277 (diff) | |
| download | FreeBSD-src-0aadc82afbae4dbc41da86cd4f9b2ceb8ddcb17d.zip FreeBSD-src-0aadc82afbae4dbc41da86cd4f9b2ceb8ddcb17d.tar.gz | |
Update subversion-1.8.0 -> 1.8.1. Update supporting
components: apr-1.4.6 -> 1.4.8 and apr-util-1.4.1 -> 1.5.2.
This is a post point-zero bug-fix / fix-sharp-edges release, including
some workarounds for UTF-8 for people who haven't yet turned on WITH_ICONV.
Diffstat (limited to 'contrib/apr-util/misc')
| -rw-r--r-- | contrib/apr-util/misc/apr_thread_pool.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/apr-util/misc/apr_thread_pool.c b/contrib/apr-util/misc/apr_thread_pool.c index 01c2e21..a12f31a 100644 --- a/contrib/apr-util/misc/apr_thread_pool.c +++ b/contrib/apr-util/misc/apr_thread_pool.c @@ -363,8 +363,7 @@ APU_DECLARE(apr_status_t) apr_thread_pool_create(apr_thread_pool_t ** me, rv = thread_pool_construct(tp, init_threads, max_threads); if (APR_SUCCESS != rv) return rv; - apr_pool_cleanup_register(tp->pool, tp, thread_pool_cleanup, - apr_pool_cleanup_null); + apr_pool_pre_cleanup_register(tp->pool, tp, thread_pool_cleanup); while (init_threads) { /* Grab the mutex as apr_thread_create() and thread_pool_func() will @@ -393,7 +392,8 @@ APU_DECLARE(apr_status_t) apr_thread_pool_create(apr_thread_pool_t ** me, APU_DECLARE(apr_status_t) apr_thread_pool_destroy(apr_thread_pool_t * me) { - return apr_pool_cleanup_run(me->pool, me, thread_pool_cleanup); + apr_pool_destroy(me->pool); + return APR_SUCCESS; } /* |
