Author: rjung
Date: Mon Mar 7 16:47:25 2011
New Revision: 1078851
URL: http://svn.apache.org/viewvc?rev=1078851&view=rev
Log:
Revert r1032065: Add support for versioned webapps in Tomcat.
The implementation of versioned webapps changed.
They do no longer encode the version in the session id.
Modified:
tomcat/jk/trunk/native/common/jk_lb_worker.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1078851&r1=1078850&r2=1078851&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Mon Mar 7 16:47:25 2011
@@ -947,7 +947,7 @@ static int get_most_suitable_worker(jk_w
"searching worker for partial sessionid %s",
sessionid);
session_route = strchr(sessionid, '.');
- while (session_route) {
+ if (session_route) {
++session_route;
if (JK_IS_DEBUG_LEVEL(l))
@@ -971,7 +971,6 @@ static int get_most_suitable_worker(jk_w
JK_TRACE_EXIT(l);
return rc;
}
- session_route = strchr(session_route, '.');
}
/* Try next partial sessionid if present */
sessionid = next;
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1078851&r1=1078850&r2=1078851&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Mar 7 16:47:25 2011
@@ -49,11 +49,6 @@
"JK_LB_ACTIVATION". Possible values are "ACT" (active),
"DIS" (disabled) and "STP" (stopped). (rjung)
</add>
- <add>
- LB: Add support for versioned webapps in Tomcat by accepting
- multiple occurances of the route separator character '.' in
- the session id. (rjung)
- </add>
<fix>
<bug>41263</bug>: Support Servlet API getRemotePort().
Works for Tomcat 5.5.28, 6.0.20 and 7.0.0 and Apache and ISAPI
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
