diff options
| author | Sander Striker <striker@apache.org> | 2002-05-30 02:21:27 +0200 |
|---|---|---|
| committer | Sander Striker <striker@apache.org> | 2002-05-30 02:21:27 +0200 |
| commit | b1d454e981754d4e4aad3b03b6774179e43120ed (patch) | |
| tree | 1c64236a70d45195c4b40fa7cb2afce0b93640bd /server | |
| parent | Tokenize the arguments for rewrite programs during config parsing, and (diff) | |
| download | apache2-b1d454e981754d4e4aad3b03b6774179e43120ed.tar.xz apache2-b1d454e981754d4e4aad3b03b6774179e43120ed.zip | |
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
Diffstat (limited to 'server')
| -rw-r--r-- | server/mpm/beos/beos.c | 2 | ||||
| -rw-r--r-- | server/mpm/experimental/leader/leader.c | 2 | ||||
| -rw-r--r-- | server/mpm/experimental/threadpool/threadpool.c | 2 | ||||
| -rw-r--r-- | server/mpm/netware/mpm_netware.c | 2 | ||||
| -rw-r--r-- | server/mpm/prefork/prefork.c | 2 | ||||
| -rw-r--r-- | server/mpm/worker/worker.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c index db6173f03f..bf4807ebb6 100644 --- 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 c23cea9f28..2e0c956944 100644 --- 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 5692885c30..ecb2dba7a3 100644 --- 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 cd19cd0224..be078d2ea4 100644 --- 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 1f5f7a0d24..428912914a 100644 --- 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 93bc30f2df..5f801a627a 100644 --- 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; |