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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 1ca39b8caf Use sendRedirect() to handle relative redirects, buffering, 
etc.
1ca39b8caf is described below

commit 1ca39b8cafc9f03001e8fb66f90f949e8f643cb7
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Mar 12 11:53:20 2026 +0000

    Use sendRedirect() to handle relative redirects, buffering, etc.
---
 java/org/apache/catalina/valves/LoadBalancerDrainingValve.java | 3 +--
 webapps/docs/changelog.xml                                     | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java 
b/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
index 2d95eb2a7e..c907c10e4d 100644
--- a/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
+++ b/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
@@ -223,8 +223,7 @@ public class LoadBalancerDrainingValve extends ValveBase {
 
             // NOTE: Do not call response.encodeRedirectURL or the bad
             // sessionid will be restored
-            response.setHeader("Location", uri);
-            response.setStatus(_redirectStatusCode);
+            response.sendRedirect(uri, _redirectStatusCode);
         } else {
             getNext().invoke(request, response);
         }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ce7358fee5..fddb1f868e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,10 @@
         <code>Content-Length</code> and <code>Content-Type</code> headers when
         accessed using the <code>getHeader</code> method and similar. (remm)
       </fix>
+      <fix>
+        <bug>69940</bug>: Improve redirect handling in the
+        <code>LoadBalancerDrainingValve</code>. (schultz)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">


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

Reply via email to