]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r420936, r420954, r420986, r421283 from trunk:
authorJim Jagielski <jim@apache.org>
Wed, 30 Aug 2006 17:50:47 +0000 (17:50 +0000)
committerJim Jagielski <jim@apache.org>
Wed, 30 Aug 2006 17:50:47 +0000 (17:50 +0000)
commit920d31a23d5611fbfe5ec3616996e13c7d52e021
tree9a3477681140290a7bcf97bf6d14b2c7c87ef196
parent5b7a61aab0a0a5241fa94cff02ac01826b75e541
Merge r420936, r420954, r420986, r421283 from trunk:

Restructure the find_route_worker() function. Basically,
it should take care of knowing about usable and unusable
workers. By centralizing this logic, it will make it
easier and more streamlined to add in the forthcoming
hot-standby status workers.

Clean up some proxy macros. Avoid the use of magic
numbers, and instead use pre-defined defines. Also,
ensure that usable workers have been initialized :)

Allocate a bit for hot standbys. Adjust so that
normal "usable" workers don't count these.

Add in hot-standby balancer member. If all other members
are disabled or not-usable, ONLY THEN will the hot
standby's be used.

Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@438563 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
modules/proxy/mod_proxy.c
modules/proxy/mod_proxy.h
modules/proxy/mod_proxy_balancer.c
modules/proxy/proxy_util.c