www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Revert the hack for setting the lbmethod.

Browse Source 
The problem is deeper inside caused by the
new hook to the balancer module that is never
called on WIN32.
Although the hack fixed core dump, the proxy is
still unusable because the configuration is failing
due to the empty lbmethod names array.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@233514 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mladen Turk
2005-08-19 17:19:54 +00:00
parent 9fdf7c8ac4
commit f2b99c52c0
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/proxy/mod_proxy_balancer.c
View File

@@ -359,6 +359,11 @@ static proxy_worker *find_best_bytraffic(proxy_balancer *balancer,
return mycandidate;
}
static proxy_balancer_method _default_lbmethod = {
"byrequests",
find_best_byrequests
};
static proxy_worker *find_best_worker(proxy_balancer *balancer,
request_rec *r)
{
@@ -367,13 +372,6 @@ static proxy_worker *find_best_worker(proxy_balancer *balancer,
if (PROXY_THREAD_LOCK(balancer) != APR_SUCCESS)
return NULL;
if (!(*balancer->lbmethod->finder)) {
/* XXX: UGLY HACK!!!
* Where is the finder function setup?
*/
balancer->lbmethod->finder = find_best_byrequests;
}
candidate = (*balancer->lbmethod->finder)(balancer, r);
/*
@@ -879,6 +877,9 @@ static void child_init(apr_pool_t *p, server_rec *s)
balancer = (proxy_balancer *)conf->balancers->elts;
for (i = 0; i < conf->balancers->nelts; i++) {
init_balancer_members(conf, s, balancer);
if (!balancer->lbmethod->finder) {
balancer->lbmethod->finder = _default_lbmethod;
}
balancer++;
}
s = s->next;