Skip to content

Commit 6433e92

Browse files
committed
* Do not add a space before '|' when setting the value for stickysession in the
balancer manager as this breaks the stickysession configuration once a new configuration is submitted by the balancer manager. PR: 69510 Submitted by: Yutaka Tokunou <[email protected]> Reviewed by: rpluem git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1923101 13f79535-47bb-0310-9956-ffa450edef68
1 parent bd3d081 commit 6433e92

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

changes-entries/69510.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*) mod_proxy_balancer: Fix the handling of the stickysession configuration
2+
parameter by the balancer manager. PR 69510
3+
[Yutaka Tokunou <[email protected]>]

modules/proxy/mod_proxy_balancer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1643,7 +1643,7 @@ static void balancer_display_page(request_rec *r, proxy_server_conf *conf,
16431643
balancer->max_workers - (int)storage->num_free_slots(balancer->wslot));
16441644
if (*balancer->s->sticky) {
16451645
if (strcmp(balancer->s->sticky, balancer->s->sticky_path)) {
1646-
ap_rvputs(r, "<td>", ap_escape_html(r->pool, balancer->s->sticky), " | ",
1646+
ap_rvputs(r, "<td>", ap_escape_html(r->pool, balancer->s->sticky), "|",
16471647
ap_escape_html(r->pool, balancer->s->sticky_path), NULL);
16481648
}
16491649
else {
@@ -1828,7 +1828,7 @@ static void balancer_display_page(request_rec *r, proxy_server_conf *conf,
18281828
ap_rputs("</tr>\n", r);
18291829
ap_rputs("<tr><td>Sticky Session:</td><td><input name='b_ss' id='b_ss' size=64 type=text ", r);
18301830
if (strcmp(bsel->s->sticky, bsel->s->sticky_path)) {
1831-
ap_rvputs(r, "value =\"", ap_escape_html(r->pool, bsel->s->sticky), " | ",
1831+
ap_rvputs(r, "value =\"", ap_escape_html(r->pool, bsel->s->sticky), "|",
18321832
ap_escape_html(r->pool, bsel->s->sticky_path), NULL);
18331833
}
18341834
else {

0 commit comments

Comments
 (0)