]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
* Do not add a space before '|' when setting the value for stickysession in the
authorRuediger Pluem <rpluem@apache.org>
Mon, 13 Jan 2025 13:37:40 +0000 (13:37 +0000)
committerRuediger Pluem <rpluem@apache.org>
Mon, 13 Jan 2025 13:37:40 +0000 (13:37 +0000)
  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

changes-entries/69510.txt [new file with mode: 0644]
modules/proxy/mod_proxy_balancer.c

diff --git a/changes-entries/69510.txt b/changes-entries/69510.txt
new file mode 100644 (file)
index 0000000..ba09b60
--- /dev/null
@@ -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>]
index 38ff05c7f2e4252cb2b9cec1129d45a18c96c916..984c61f016e3012e5042b7c301a6bdc9a27092cf 100644 (file)
@@ -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 {