1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00

No longer depend on how fork() works when laying out segments...

function pointers in shm are... nasty ;)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1072098 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2011-02-18 18:40:25 +00:00
parent ce73ec0484
commit aac783bdf5
4 changed files with 60 additions and 34 deletions

View File

@@ -322,9 +322,12 @@ static const char *set_balancer_param(proxy_server_conf *conf,
}
else if (!strcasecmp(key, "lbmethod")) {
proxy_balancer_method *provider;
if (strlen(val) > (sizeof(balancer->s->lbpname)-1))
return "unknown lbmethod";
provider = ap_lookup_provider(PROXY_LBMETHOD, val, "0");
if (provider) {
balancer->s->lbmethod = provider;
balancer->lbmethod = provider;
PROXY_STRNCPY(balancer->s->lbpname, val);
return NULL;
}
return "unknown lbmethod";
@@ -2309,7 +2312,7 @@ static int proxy_status_hook(request_rec *r, int flags)
ap_rprintf(r, "</td><td>%" APR_TIME_T_FMT "</td>",
apr_time_sec(balancer->s->timeout));
ap_rprintf(r, "<td>%s</td>\n",
balancer->s->lbmethod->name);
balancer->lbmethod->name);
ap_rputs("</table>\n", r);
ap_rputs("\n\n<table border=\"0\"><tr>"
"<th>Sch</th><th>Host</th><th>Stat</th>"