Diff of /httpd/httpd/branches/2.2.x/server/mpm/worker/worker.c

Parent Directory | Revision Log | Patch

--- httpd/httpd/branches/2.2.x/server/mpm/worker/worker.c	2005/09/19 15:51:22	290189
+++ httpd/httpd/branches/2.2.x/server/mpm/worker/worker.c	2005/10/01 11:02:10	292949
@@ -724,6 +724,7 @@
             }
             else {
                 ptrans = recycled_pool;
+                recycled_pool = NULL;
             }
             apr_pool_tag(ptrans, "transaction");
             rv = lr->accept_func(&csd, lr, ptrans);
@@ -760,11 +761,15 @@
                     apr_socket_close(csd);
                     ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf,
                                  "ap_queue_push failed");
+                    recycled_pool = ptrans;
                 }
                 else {
                     have_idle_worker = 0;
                 }
             }
+            else {
+                recycled_pool = ptrans;
+            }
         }
         else {
             if ((rv = SAFE_ACCEPT(apr_proc_mutex_unlock(accept_mutex)))