From 7218b78f44113f45a1f6c97efc89e8728316eb52 Mon Sep 17 00:00:00 2001 From: Ryan Bloom Date: Mon, 22 May 2000 17:05:23 +0000 Subject: [PATCH] Remove ap_destroy_context from Apache 2.0. With the name change back to ap_pool_t, this function doesn't make sense. This also changes all references to ap_destroy_context back to ap_destroy_pool. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85271 13f79535-47bb-0310-9956-ffa450edef68 --- modules/metadata/mod_mime_magic.c | 4 ++-- server/mpm/dexter/dexter.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c index 55dabdc6fb..29d28fb74e 100644 --- a/modules/metadata/mod_mime_magic.c +++ b/modules/metadata/mod_mime_magic.c @@ -2232,12 +2232,12 @@ static int uncompress(request_rec *r, int method, *newch = (unsigned char *) ap_palloc(r->pool, n); rv = ap_bread(bout, *newch, n, &n); if (n == 0) { - ap_destroy_context(sub_context); + ap_destroy_pool(sub_context); ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, MODNAME ": read failed %s", r->filename); return -1; } - ap_destroy_context(sub_context); + ap_destroy_pool(sub_context); return n; } diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c index 47c875c7d4..72012d63ec 100644 --- a/server/mpm/dexter/dexter.c +++ b/server/mpm/dexter/dexter.c @@ -716,7 +716,7 @@ static void *worker_thread(void *arg) } pthread_mutex_lock(&thread_pool_parent_mutex); - ap_destroy_context(tpool); + ap_destroy_pool(tpool); pthread_mutex_unlock(&thread_pool_parent_mutex); pthread_mutex_lock(&worker_thread_count_mutex); worker_thread_count--; -- 2.50.1