Commit 968ffa11 authored by Sander Striker's avatar Sander Striker
Browse files

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
parent ff841f19

server/mpm/beos/beos.c

+1 −1
Changes for server/mpm/beos/beos.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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");

server/mpm/experimental/leader/leader.c

+1 −1
Changes for server/mpm/experimental/leader/leader.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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);

server/mpm/experimental/threadpool/threadpool.c

+1 −1
Changes for server/mpm/experimental/threadpool/threadpool.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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 */

server/mpm/netware/mpm_netware.c

+1 −1
Changes for server/mpm/netware/mpm_netware.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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);

server/mpm/prefork/prefork.c

+1 −1
Changes for server/mpm/prefork/prefork.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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");