VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-10 02:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge r374929 from trunk:

Browse Source 
* Do not overwrite the status of initialized workers and respect the configured
  status of uninitilized workers when creating a new child process.

Submitted by: rpluem
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@390182 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2006-03-30 17:30:32 +00:00
parent b2d46106cd
commit ca300bfa31
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -1,6 +1,10 @@
-*- coding: utf-8 -*-
Changes with Apache 2.2.1
*) mod_proxy_balancer: Do not overwrite the status of initialized workers and
respect the configured status of uninitilized workers when creating a new
child process. [Ruediger Pluem]
*) mod_proxy_ajp: Crosscheck the length of the body chunk with the length of
the ajp message to prevent mod_proxy_ajp from reading beyond the buffer
boundaries and thus revealing possibly sensitive memory contents to the

9
STATUS
View File

@ -134,15 +134,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
http://people.apache.org/~rpluem/patches/partial_2.2.diff
+1: jim, rpluem, jerenkrantz
* mod_proxy_balancer: Do not overwrite the status of initialized workers and
respect the configured status of uninitilized workers when creating a new
child process.
Trunk version of patch:
http://svn.apache.org/viewcvs?rev=374929&view=rev
Backport version for 2.2.x of patch:
Trunk version of patch works
+1: rpluem, jim, pquerna
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
* mod_dbd: When threaded, create a private pool in child_init

11
modules/proxy/mod_proxy_balancer.c
View File

@ -84,7 +84,16 @@ static int init_balancer_members(proxy_server_conf *conf, server_rec *s,
for (i = 0; i < balancer->workers->nelts; i++) {
ap_proxy_initialize_worker_share(conf, workers, s);
workers->s->status = PROXY_WORKER_INITIALIZED;
if (!(workers->s->status & PROXY_WORKER_INITIALIZED)) {
workers->s->status |= (workers->status | PROXY_WORKER_INITIALIZED);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
"proxy: BALANCER: initialized balancer member %d for "
"balancer %s in child %" APR_PID_T_FMT " for (%s) "
"min=%d max=%d smax=%d",
workers->id, balancer->name, getpid(),
workers->hostname, workers->min, workers->hmax,
workers->smax);
}
++workers;
}