Catch up with the apr_allocator_set_owner -> apr_allocator_owner_set renames

in APR.

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

diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index db6173f03fdc01ff994126c5000e462a4b50e699..bf4807ebb65a4e5ad7085fc289e76cc4a0a17588 100644 (file)
--- a/server/mpm/beos/beos.c
+++ b/server/mpm/beos/beos.c
@@ -384,7 +384,7 @@ static int32 worker_thread(void * dummy)
 
     apr_allocator_create(&allocator);
     apr_pool_create_ex(&ptrans, tpool, NULL, allocator);
-    apr_allocator_set_owner(allocator, ptrans);
+    apr_allocator_owner_set(allocator, ptrans);
 
     apr_pool_tag(ptrans, "transaction");
 

diff --git a/server/mpm/experimental/leader/leader.c b/server/mpm/experimental/leader/leader.c
index c23cea9f285b87fbc2987d557e74c2a2483213be..2e0c95694426b30876c227454d45f0161c4da34d 100644 (file)
--- a/server/mpm/experimental/leader/leader.c
+++ b/server/mpm/experimental/leader/leader.c
@@ -822,7 +822,7 @@ static void *worker_thread(apr_thread_t *thd, void * dummy)
 
     apr_allocator_create(&allocator);
     apr_pool_create_ex(&ptrans, NULL, NULL, allocator);
-    apr_allocator_set_owner(allocator, ptrans);
+    apr_allocator_owner_set(allocator, ptrans);
     bucket_alloc = apr_bucket_alloc_create(tpool);
 
     apr_poll_setup(&pollset, num_listensocks, tpool);

diff --git a/server/mpm/experimental/threadpool/threadpool.c b/server/mpm/experimental/threadpool/threadpool.c
index 5692885c307ffeed4d648cd23f802344600a1203..ecb2dba7a33a8b86137eba29590364691dc7b42b 100644 (file)
--- a/server/mpm/experimental/threadpool/threadpool.c
+++ b/server/mpm/experimental/threadpool/threadpool.c
@@ -1046,7 +1046,7 @@ static void * APR_THREAD_FUNC worker_thread(apr_thread_t *thd, void * dummy)
 
     apr_allocator_create(&allocator);
     apr_pool_create_ex(&ptrans, NULL, NULL, allocator);
-    apr_allocator_set_owner(allocator, ptrans);
+    apr_allocator_owner_set(allocator, ptrans);
 
     /* XXX: What happens if this is allocated from the
      * single-thread-optimized ptrans pool? -aaron */

diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index cd19cd02244d7f473221530aadffe66dc97e61bc..be078d2ea49cfa534c7cbaf5c051bda5258b7899 100644 (file)
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -377,7 +377,7 @@ void worker_main(void *arg)
 
     apr_allocator_create(&allocator);
     apr_pool_create_ex(&ptrans, NULL, NULL, allocator);
-    apr_allocator_set_owner(allocator, ptrans);
+    apr_allocator_owner_set(allocator, ptrans);
     apr_pool_tag(ptrans, "transaction");
 
     bucket_alloc = apr_bucket_alloc_create(pmain);

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 1f5f7a0d24ad96dcdbbb3da0b2e69347c04be3bd..428912914a21dcb1d61d750daa69775d119f80be 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -538,7 +538,7 @@ static void child_main(int child_num_arg)
      */
     apr_allocator_create(&allocator);
     apr_pool_create_ex(&pchild, pconf, NULL, allocator);
-    apr_allocator_set_owner(allocator, pchild);
+    apr_allocator_owner_set(allocator, pchild);
 
     apr_pool_create(&ptrans, pchild);
     apr_pool_tag(ptrans, "transaction");

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 93bc30f2df0fb5033690914c7534ae8a790f7efa..5f801a627a5d359b0922eef7e59ede538db3bfb0 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -797,7 +797,7 @@ static void *listener_thread(apr_thread_t *thd, void * dummy)
 
                 apr_allocator_create(&allocator);
                 apr_pool_create_ex(&ptrans, NULL, NULL, allocator);
-                apr_allocator_set_owner(allocator, ptrans);
+                apr_allocator_owner_set(allocator, ptrans);
             }
             else {
                 ptrans = recycled_pool;