Author: schultz
Date: Fri Jun 23 14:23:53 2017
New Revision: 1799677
URL: http://svn.apache.org/viewvc?rev=1799677&view=rev
Log:
Fix a bug and a small integration support improvement after review by mgrigorov.
Fix changelog after review by markt.
Modified:
tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java?rev=1799677&r1=1799676&r2=1799677&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
Fri Jun 23 14:23:53 2017
@@ -68,7 +68,7 @@ public class LoadBalancerDrainingValve
* The request attribute key where the load-balancer's activation state
* can be found.
*/
- static final String ATTRIBUTE_KEY_JK_LB_ACTIVATION = "JK_LB_ACTIVATION";
+ public static final String ATTRIBUTE_KEY_JK_LB_ACTIVATION =
"JK_LB_ACTIVATION";
/**
* The HTTP response code that will be used to redirect the request
@@ -259,8 +259,7 @@ public class LoadBalancerDrainingValve
// Re-write the URI if it contains a ;jsessionid parameter
String uri = request.getRequestURI();
- String sessionURIParamName = "jsessionid";
- SessionConfig.getSessionUriParamName(request.getContext());
+ String sessionURIParamName =
SessionConfig.getSessionUriParamName(request.getContext());
if(uri.contains(";" + sessionURIParamName + "="))
uri = uri.replaceFirst(";" + sessionURIParamName + "=[^&?]*",
"");
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1799677&r1=1799676&r2=1799677&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jun 23 14:23:53 2017
@@ -52,6 +52,10 @@
protocol will trigger a warning in the logs since it is known to be
insecure. (markt)
</fix>
+ <add>
+ Add LoadBalancerDrainingValve, a Valve designed to reduce the amount of
+ time required for a node to drain its authenticated users. (schultz)
+ </add>
</changelog>
</subsection>
</section>
@@ -147,10 +151,6 @@
variable for CGI executables is populated in a consistent way
regardless
of how the CGI servlet is mapped to a request. (markt)
</fix>
- <add>
- Add LoadBalancerDrainingValve, a Valve designed to reduce the amount of
- time required for a node to drain its authenticated users. (schultz)
- </add>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
