From: Manoj Kasichainula <manoj@apache.org>
Date: Tue, 31 Aug 1999 21:34:05 +0000 (+0000)
Subject: Fix dexter to work after Ryan's context patches.
X-Git-Tag: 1.3.10~342
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=edccfa095546ed36ce530bac6895324365936d52;p=thirdparty%2Fapache%2Fhttpd.git

Fix dexter to work after Ryan's context patches.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83857 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index 39760eed387..3ff56f3b947 100644
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -857,9 +857,9 @@ static void *worker_thread(void *arg)
     long conn_id = child_num * HARD_THREAD_LIMIT + thread_num;
 
     pthread_mutex_lock(&thread_pool_create_mutex);
-    tpool = ap_make_sub_pool(thread_pool_parent);
+    ap_create_context(thread_pool_parent, NULL, &tpool);
     pthread_mutex_unlock(&thread_pool_create_mutex);
-    ptrans = ap_make_sub_pool(tpool);
+    ap_create_context(tpool, NULL, &ptrans);
 
     while (!workers_may_exit) {
         workers_may_exit |= (max_requests_per_child != 0) && (requests_this_child <= 0);
@@ -979,7 +979,7 @@ static void child_main(int child_num_arg)
 
     my_pid = getpid();
     child_num = child_num_arg;
-    pchild = ap_make_sub_pool(pconf);
+    ap_create_context(pconf, NULL, &pchild);
 
     /*stuff to do before we switch id's, so we have permissions.*/
 
@@ -1024,7 +1024,7 @@ static void child_main(int child_num_arg)
     for (i = 0; i < max_threads; i++) {
         worker_thread_free_ids[i] = i;
     }
-    thread_pool_parent = ap_make_sub_pool(pchild);
+    ap_create_context(pchild, NULL, &thread_pool_parent);
     pthread_mutex_init(&thread_pool_create_mutex, NULL);
     pthread_mutex_init(&idle_thread_count_mutex, NULL);
     pthread_mutex_init(&worker_thread_count_mutex, NULL);