diff options
| author | Yann Ylavic <ylavic@apache.org> | 2018-01-27 03:01:47 +0100 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2018-01-27 03:01:47 +0100 |
| commit | 30b587effb2a59e5cbf887600d1b4e195aa35377 (patch) | |
| tree | e511a1a6bb1ab990f95b9d84923b89638b13b836 /server/mpm/worker/worker.c | |
| parent | PR 62044: Force addition of generation number to shm filename on (diff) | |
| download | apache2-30b587effb2a59e5cbf887600d1b4e195aa35377.tar.xz apache2-30b587effb2a59e5cbf887600d1b4e195aa35377.zip | |
mpm_fdqueue: follow up to r1821624.
Export ap_queue_*() fonctions, so that they are accessible from MPMs, but
don't provide "mpm_fdqueue.h" in the API (include/).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1822366 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm/worker/worker.c')
| -rw-r--r-- | server/mpm/worker/worker.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index 340dff94cb..1d475c3d09 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -676,7 +676,7 @@ static void * APR_THREAD_FUNC listener_thread(apr_thread_t *thd, void * dummy) if (!listener_may_exit) { /* the following pops a recycled ptrans pool off a stack */ - ap_pop_pool(&ptrans, worker_queue_info); + ap_queue_info_pop_pool(worker_queue_info, &ptrans); if (ptrans == NULL) { /* we can't use a recycled transaction pool this time. * create a new transaction pool */ @@ -743,7 +743,7 @@ static void * APR_THREAD_FUNC listener_thread(apr_thread_t *thd, void * dummy) } ap_close_listeners_ex(my_bucket->listeners); - ap_free_idle_pools(worker_queue_info); + ap_queue_info_free_idle_pools(worker_queue_info); ap_queue_term(worker_queue); dying = 1; ap_scoreboard_image->parent[process_slot].quiescing = 1; |