]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Fix dexter to work after Ryan's context patches.
authorManoj Kasichainula <manoj@apache.org>
Tue, 31 Aug 1999 21:34:05 +0000 (21:34 +0000)
committerManoj Kasichainula <manoj@apache.org>
Tue, 31 Aug 1999 21:34:05 +0000 (21:34 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83857 13f79535-47bb-0310-9956-ffa450edef68

server/mpm/dexter/dexter.c

index 39760eed387678cd699427cce19a9f17b08d43e3..3ff56f3b947313e7bc11c680b4772f7d769650d6 100644 (file)
@@ -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);