This is an automated email from the ASF dual-hosted git repository.

markt-asf pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
     new b9ad7fa2d2 Re-order
b9ad7fa2d2 is described below

commit b9ad7fa2d2a963bc06f237f3238ae7de510ba0fe
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Oct 27 09:41:22 2026 +0000

    Re-order
---
 java/org/apache/catalina/valves/LoadBalancerDrainingValve.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java 
b/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
index 568ab6314e..3e9533f208 100644
--- a/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
+++ b/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
@@ -224,12 +224,13 @@ public class LoadBalancerDrainingValve extends ValveBase {
                 response.addCookie(sessionCookie);
             }
 
-            String uri = collapseLeadingSlashes(request.getRequestURI());
+            String uri = request.getRequestURI();
             // Re-write the URI if it contains a ;jsessionid parameter
             String sessionURIParamName = 
SessionConfig.getSessionUriParamName(context);
             if (uri.contains(";" + sessionURIParamName + "=")) {
                 uri = uri.replaceFirst(";" + sessionURIParamName + "=[^;/]*", 
"");
             }
+            uri = collapseLeadingSlashes(uri);
 
             String queryString = request.getQueryString();
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to