43 lines
2.2 KiB
Diff
43 lines
2.2 KiB
Diff
|
From c8c5aef865dd4dfcce6606cf5a4fba1e815adb0f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jim Jagielski <jim@apache.org>
|
||
|
|
Date: Wed, 15 Jan 2025 12:03:59 +0000
|
||
|
|
Subject: [PATCH] *) 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
|
||
|
|
|
||
|
|
Conflict:NA
|
||
|
|
Reference:https://github.com/apache/httpd/commit/c8c5aef865dd4dfcce6606cf5a4fba1e815adb0f
|
||
|
|
|
||
|
|
---
|
||
|
|
modules/proxy/mod_proxy_balancer.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
|
||
|
|
index 6ec6383..77344c8 100644
|
||
|
|
--- a/modules/proxy/mod_proxy_balancer.c
|
||
|
|
+++ b/modules/proxy/mod_proxy_balancer.c
|
||
|
|
@@ -1704,7 +1704,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 {
|
||
|
|
@@ -1889,7 +1889,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 {
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|