Skip to content

Commit c8c5aef

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 trunk patch: https://svn.apache.org/r1923101 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923145 13f79535-47bb-0310-9956-ffa450edef68
1 parent 0e76f5b commit c8c5aef

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CHANGES

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
-*- coding: utf-8 -*-
22
Changes with Apache 2.4.63
33

4+
*) mod_proxy_balancer: Fix the handling of the stickysession configuration
5+
parameter by the balancer manager. PR 69510
6+
[Yutaka Tokunou <[email protected]>]
7+
48
*) Add the ldap-search option to mod_authnz_ldap, allowing authorization
59
to be based on arbitrary expressions that do not include the username.
610
Make sure that when ldap searches are too long, we explicitly log the

modules/proxy/mod_proxy_balancer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,7 +1669,7 @@ static void balancer_display_page(request_rec *r, proxy_server_conf *conf,
16691669
balancer->max_workers - (int)storage->num_free_slots(balancer->wslot));
16701670
if (*balancer->s->sticky) {
16711671
if (strcmp(balancer->s->sticky, balancer->s->sticky_path)) {
1672-
ap_rvputs(r, "<td>", ap_escape_html(r->pool, balancer->s->sticky), " | ",
1672+
ap_rvputs(r, "<td>", ap_escape_html(r->pool, balancer->s->sticky), "|",
16731673
ap_escape_html(r->pool, balancer->s->sticky_path), NULL);
16741674
}
16751675
else {
@@ -1854,7 +1854,7 @@ static void balancer_display_page(request_rec *r, proxy_server_conf *conf,
18541854
ap_rputs("</tr>\n", r);
18551855
ap_rputs("<tr><td>Sticky Session:</td><td><input name='b_ss' id='b_ss' size=64 type=text ", r);
18561856
if (strcmp(bsel->s->sticky, bsel->s->sticky_path)) {
1857-
ap_rvputs(r, "value =\"", ap_escape_html(r->pool, bsel->s->sticky), " | ",
1857+
ap_rvputs(r, "value =\"", ap_escape_html(r->pool, bsel->s->sticky), "|",
18581858
ap_escape_html(r->pool, bsel->s->sticky_path), NULL);
18591859
}
18601860
else {

0 commit comments

Comments
 (0)