Author: markt
Date: Sun Jan 6 15:10:34 2008
New Revision: 609463
URL: http://svn.apache.org/viewvc?rev=609463&view=rev
Log:
Fix bug 43839. URL based session tracking fails when session cookie from parent
context is present. Based on a patch by Yuan Qingyun.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java?rev=609463&r1=609462&r2=609463&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
Sun Jan 6 15:10:34 2008
@@ -406,6 +406,14 @@
*/
protected void parseSessionCookiesId(org.apache.coyote.Request req,
Request request) {
+ // If session tracking via cookies has been disabled for the current
+ // context, don't go looking for a session ID in a cookie as a cookie
+ // from a parent context with a session ID may be present which would
+ // overwrite the valid session ID encoded in the URL
+ Context context = (Context) request.getMappingData().context;
+ if (context != null && !context.getCookies())
+ return;
+
// Parse session id from cookies
Cookies serverCookies = req.getCookies();
int count = serverCookies.getCookieCount();
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609463&r1=609462&r2=609463&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan 6 15:10:34 2008
@@ -102,6 +102,11 @@
and will be unescaped during parsing.
</fix>
<fix>
+ <bug>43839</bug>: URL based session tracking fails when session cookie
+ from parent context is present. Based on a patch by Yuan Qingyun.
+ (markt)
+ </fix>
+ <fix>
<bug>43887</bug>: Include exception in the log message. (markt)
</fix>
<fix>
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609463&r1=609462&r2=609463&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan 6 15:10:34 2008
@@ -49,14 +49,6 @@
martk - change "FarmWarDeployer can only work as parent from " to
"FarmWarDeployer can only work if parent of "
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43839
- URL based session tracking fails when session cookie from parent context is
- present. Based on a patch by Yuan Qingyun.
- http://svn.apache.org/viewvc?rev=606944&view=rev
- http://svn.apache.org/viewvc?rev=609003&view=rev
- +1: markt,funkman, fhanik, pero
- -1:
-
* Remove unused dependency on HttpClient
http://people.apache.org/~funkman/tc5.5-build.properties.patch
+1: funkman, pero, markt
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
