From: Greg Ames <gregames@apache.org>
Date: Sat, 8 Oct 2005 03:47:15 +0000 (+0000)
Subject: remove the recycled_pool variable to keep it more in sync with worker.
X-Git-Tag: 2.3.0~2894
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5d8311d59b799a2fffec716e6890a74aebace00;p=thirdparty%2Fapache%2Fhttpd.git

remove the recycled_pool variable to keep it more in sync with worker.

event already had logic in the listener thread error legs to prevent
leaking ptrans, so this is mostly cosmetic.


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

diff --git a/server/mpm/experimental/event/event.c b/server/mpm/experimental/event/event.c
index 2d26957bdb2..72ba228b095 100644
--- a/server/mpm/experimental/event/event.c
+++ b/server/mpm/experimental/event/event.c
@@ -930,13 +930,12 @@ static void *listener_thread(apr_thread_t * thd, void *dummy)
             }
             else {
                 /* A Listener Socket is ready for an accept() */
-                apr_pool_t *recycled_pool = NULL;
 
                 lr = (ap_listen_rec *) pt->baton;
 
-                ap_pop_pool(&recycled_pool, worker_queue_info);
+                ap_pop_pool(&ptrans, worker_queue_info);
 
-                if (recycled_pool == NULL) {
+                if (ptrans == NULL) {
                     /* create a new transaction pool for each accepted socket */
                     apr_allocator_t *allocator;
 
@@ -953,9 +952,6 @@ static void *listener_thread(apr_thread_t * thd, void *dummy)
                         return NULL;
                     }
                 }
-                else {
-                    ptrans = recycled_pool;
-                }
 
                 apr_pool_tag(ptrans, "transaction");