You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2005/10/08 01:31:39 UTC
svn commit: r307218 - in /httpd/httpd/branches/2.0.x: CHANGES STATUS
server/mpm/worker/worker.c
Author: trawick
Date: Fri Oct 7 16:31:32 2005
New Revision: 307218
URL: http://svn.apache.org/viewcvs?rev=307218&view=rev
Log:
Commit Greg's patch to fix worker MPM memory leak.
Approved by: Greg, OtherBill, Jeff
Modified:
httpd/httpd/branches/2.0.x/CHANGES
httpd/httpd/branches/2.0.x/STATUS
httpd/httpd/branches/2.0.x/server/mpm/worker/worker.c
Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?rev=307218&r1=307217&r2=307218&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Fri Oct 7 16:31:32 2005
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.0.55
+ *) worker MPM: Fix a memory leak which can occur after an aborted
+ connection in some limited circumstances. [Greg Ames]
+
*) mod_ldap: Fix PR 36563. Keep track of the number of attributes
retrieved from LDAP so that all of the values can be properly
cached even if the value is NULL.
Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/STATUS?rev=307218&r1=307217&r2=307218&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Fri Oct 7 16:31:32 2005
@@ -110,15 +110,6 @@
+1: jorton, wrowe, trawick
wrowe cautions to backport to 2.2.x branch as well.
- *) SECURITY: CAN-2005-2970 (cve.mitre.org)
- worker MPM: Fix a memory leak which can occur after an aborted
- connection in some limited circumstances.
- http://people.apache.org/~trawick/CAN-2005-2970.txt
- +1: trawick, brianp
- +0: wrowe [greg ames and jeff trawick were of two minds, I'm
- +1 on either patch they mutually agree upon.]
-
-
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
Modified: httpd/httpd/branches/2.0.x/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/server/mpm/worker/worker.c?rev=307218&r1=307217&r2=307218&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/server/mpm/worker/worker.c (original)
+++ httpd/httpd/branches/2.0.x/server/mpm/worker/worker.c Fri Oct 7 16:31:32 2005
@@ -574,8 +574,7 @@
int process_slot = ti->pid;
apr_pool_t *tpool = apr_thread_pool_get(thd);
void *csd = NULL;
- apr_pool_t *ptrans; /* Pool for per-transaction stuff */
- apr_pool_t *recycled_pool = NULL;
+ apr_pool_t *ptrans = NULL; /* Pool for per-transaction stuff */
int n;
apr_pollfd_t *pollset;
apr_status_t rv;
@@ -604,8 +603,11 @@
if (listener_may_exit) break;
if (!have_idle_worker) {
+ /* the following pops a recycled ptrans pool off a stack
+ * if there is one, in addition to reserving a worker thread
+ */
rv = ap_queue_info_wait_for_idler(worker_queue_info,
- &recycled_pool);
+ &ptrans);
if (APR_STATUS_IS_EOF(rv)) {
break; /* we've been signaled to die now */
}
@@ -682,17 +684,15 @@
}
got_fd:
if (!listener_may_exit) {
- /* create a new transaction pool for each accepted socket */
- if (recycled_pool == NULL) {
+ if (ptrans == NULL) {
+ /* we can't use a recycled transaction pool this time.
+ * create a new transaction pool */
apr_allocator_t *allocator;
apr_allocator_create(&allocator);
apr_allocator_max_free_set(allocator, ap_max_mem_free);
apr_pool_create_ex(&ptrans, NULL, NULL, allocator);
apr_allocator_owner_set(allocator, ptrans);
- }
- else {
- ptrans = recycled_pool;
}
apr_pool_tag(ptrans, "transaction");
rv = lr->accept_func(&csd, lr, ptrans);
Re: svn commit: r307218 - in /httpd/httpd/branches/2.0.x: CHANGES STATUS server/mpm/worker/worker.c
Posted by Jeff Trawick <tr...@gmail.com>.
On 10/7/05, trawick@apache.org <tr...@apache.org> wrote:
> Author: trawick
> Date: Fri Oct 7 16:31:32 2005
> New Revision: 307218
>
> URL: http://svn.apache.org/viewcvs?rev=307218&view=rev
> Log:
> Commit Greg's patch to fix worker MPM memory leak.
>
> Approved by: Greg, OtherBill, Jeff
I'll get Greg's patch in 2.2.x and trunk in the very near future
(tonight or tomorrow a.m.).