summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuediger Pluem <rpluem@apache.org>2025-01-13 14:37:40 +0100
committerRuediger Pluem <rpluem@apache.org>2025-01-13 14:37:40 +0100
commit6433e9252057be5a9b10f9f02919564c3844b552 (patch)
tree2e784efaeeb2a3b77609aa0e1fc970de1de93739
parentfr doc rebuild with new year. (diff)
downloadapache2-6433e9252057be5a9b10f9f02919564c3844b552.tar.xz
apache2-6433e9252057be5a9b10f9f02919564c3844b552.zip
* 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 <tokunou.yutaka@fujitsu.com> Reviewed by: rpluem git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1923101 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--changes-entries/69510.txt3
-rw-r--r--modules/proxy/mod_proxy_balancer.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/changes-entries/69510.txt b/changes-entries/69510.txt
new file mode 100644
index 0000000000..ba09b602ea
--- /dev/null
+++ b/changes-entries/69510.txt
@@ -0,0 +1,3 @@
+ *) mod_proxy_balancer: Fix the handling of the stickysession configuration
+ parameter by the balancer manager. PR 69510
+ [Yutaka Tokunou <tokunou.yutaka@fujitsu.com>]
diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index 38ff05c7f2..984c61f016 100644
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -1643,7 +1643,7 @@ static void balancer_display_page(request_rec *r, proxy_server_conf *conf,
balancer->max_workers - (int)storage->num_free_slots(balancer->wslot));
if (*balancer->s->sticky) {
if (strcmp(balancer->s->sticky, balancer->s->sticky_path)) {
- ap_rvputs(r, "<td>", ap_escape_html(r->pool, balancer->s->sticky), " | ",
+ ap_rvputs(r, "<td>", ap_escape_html(r->pool, balancer->s->sticky), "|",
ap_escape_html(r->pool, balancer->s->sticky_path), NULL);
}
else {
@@ -1828,7 +1828,7 @@ static void balancer_display_page(request_rec *r, proxy_server_conf *conf,
ap_rputs("</tr>\n", r);
ap_rputs("<tr><td>Sticky Session:</td><td><input name='b_ss' id='b_ss' size=64 type=text ", r);
if (strcmp(bsel->s->sticky, bsel->s->sticky_path)) {
- ap_rvputs(r, "value =\"", ap_escape_html(r->pool, bsel->s->sticky), " | ",
+ ap_rvputs(r, "value =\"", ap_escape_html(r->pool, bsel->s->sticky), "|",
ap_escape_html(r->pool, bsel->s->sticky_path), NULL);
}
else {