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

Adjust since we are now in shared mem area

Browse Source 
Thx Werror: error: address of array 'balancer->s->sticky' will always evaluate to 'true'


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705776 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2015-09-28 21:04:45 +00:00
parent e613410e6b
commit 96f716ff3a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/proxy/mod_proxy_balancer.c
View File

@@ -1257,7 +1257,7 @@ static int balancer_handler(request_rec *r)
ap_rputs(" <httpd:balancer>\n", r); ap_rputs(" <httpd:balancer>\n", r);
/* Start proxy_balancer */ /* Start proxy_balancer */
ap_rvputs(r, " <httpd:name>", balancer->s->name, "</httpd:name>\n", NULL); ap_rvputs(r, " <httpd:name>", balancer->s->name, "</httpd:name>\n", NULL);
if (balancer->s->sticky) { if (*balancer->s->sticky) {
ap_rvputs(r, " <httpd:stickysession>", balancer->s->sticky, ap_rvputs(r, " <httpd:stickysession>", balancer->s->sticky,
"</httpd:stickysession>\n", NULL); "</httpd:stickysession>\n", NULL);
ap_rprintf(r, ap_rprintf(r,
@@ -1274,7 +1274,7 @@ static int balancer_handler(request_rec *r)
} }
ap_rvputs(r, " <httpd:lbmethod>", balancer->lbmethod->name, ap_rvputs(r, " <httpd:lbmethod>", balancer->lbmethod->name,
"</httpd:lbmethod>\n", NULL); "</httpd:lbmethod>\n", NULL);
if (balancer->s->sticky) { if (*balancer->s->sticky) {
ap_rprintf(r, ap_rprintf(r,
" <httpd:scolonpathdelim>%s</httpd:scolonpathdelim>\n", " <httpd:scolonpathdelim>%s</httpd:scolonpathdelim>\n",
(balancer->s->scolonsep ? "On" : "Off")); (balancer->s->scolonsep ? "On" : "Off"));
@@ -1511,7 +1511,7 @@ static int balancer_handler(request_rec *r)
ap_rprintf(r, "<td>%s</td>\n", ap_rprintf(r, "<td>%s</td>\n",
balancer->s->lbpname); balancer->s->lbpname);
ap_rputs("<td>", r); ap_rputs("<td>", r);
if (balancer->s->vhost && *(balancer->s->vhost)) { if (*balancer->s->vhost) {
ap_rvputs(r, balancer->s->vhost, " -> ", NULL); ap_rvputs(r, balancer->s->vhost, " -> ", NULL);
} }
ap_rvputs(r, balancer->s->vpath, "</td>\n", NULL); ap_rvputs(r, balancer->s->vpath, "</td>\n", NULL);