Author: markt Date: Fri Nov 27 16:11:23 2015 New Revision: 1716894 URL: http://svn.apache.org/viewvc?rev=1716894&view=rev Log: Additional fix for BZ 58660 When Mapper root redirect is enabled, ensure '/' is added to path for redirect
Modified: tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java Modified: tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1716894&r1=1716893&r2=1716894&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java (original) +++ tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java Fri Nov 27 16:11:23 2015 @@ -879,8 +879,10 @@ public final class Mapper { if(mappingData.wrapper == null && noServletPath && mappingData.context.getMapperContextRootRedirectEnabled()) { // The path is empty, redirect to "/" + path.append('/'); + pathEnd = path.getEnd(); mappingData.redirectPath.setChars - (path.getBuffer(), pathOffset, pathEnd-pathOffset); + (path.getBuffer(), pathOffset, pathEnd - pathOffset); path.setEnd(pathEnd - 1); return; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org