Author: markt Date: Mon Oct 27 06:02:47 2008 New Revision: 708163 URL: http://svn.apache.org/viewvc?rev=708163&view=rev Log: Fix issue with nested contexts and context.xml files
Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=708163&r1=708162&r2=708163&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 06:02:47 2008 @@ -178,11 +178,6 @@ +1: markt -0: remm (I also do not think the patch is a good idea as a backport) -* Fix issue with nested contexts and context.xml files - http://svn.apache.org/viewvc?rev=702208&view=rev - +1: markt, remm, fhanik - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45951 Support changing of JSESSIONID cookie name and jsessionid path parameter name http://svn.apache.org/viewvc?rev=702219&view=rev Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=708163&r1=708162&r2=708163&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon Oct 27 06:02:47 2008 @@ -854,9 +854,9 @@ docBase = "ROOT"; } else { if (path.startsWith("/")) { - docBase = path.substring(1); + docBase = path.substring(1).replace('/', '#'); } else { - docBase = path; + docBase = path.replace('/', '#'); } } } Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=708163&r1=708162&r2=708163&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Oct 27 06:02:47 2008 @@ -124,6 +124,10 @@ <fix> Fix some thread safety issues in date formatting. (markt) </fix> + <fix> + Correct handle multi-level contexts defined using context.xml files. + (markt) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]