httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grega...@apache.org
Subject svn commit: r307250 - /httpd/httpd/trunk/server/mpm/experimental/event/event.c
Date Sat, 08 Oct 2005 03:47:18 GMT
Author: gregames
Date: Fri Oct  7 20:47:15 2005
New Revision: 307250

URL: http://svn.apache.org/viewcvs?rev=307250&view=rev
Log:
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.

Modified:
    httpd/httpd/trunk/server/mpm/experimental/event/event.c

Modified: httpd/httpd/trunk/server/mpm/experimental/event/event.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/mpm/experimental/event/event.c?rev=307250&r1=307249&r2=307250&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/experimental/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/experimental/event/event.c Fri Oct  7 20:47:15 2005
@@ -930,13 +930,12 @@
             }
             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;
 
@@ -952,9 +951,6 @@
                         signal_threads(ST_GRACEFUL);
                         return NULL;
                     }
-                }
-                else {
-                    ptrans = recycled_pool;
                 }
 
                 apr_pool_tag(ptrans, "transaction");



Mime
View raw message