You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by de...@apache.org on 2010/02/05 10:25:50 UTC
svn commit: r906868 -
/geronimo/external/trunk/tomcat-parent-6.0.24/util/src/main/java/org/apache/tomcat/util/http/mapper/Mapper.java
Author: delos
Date: Fri Feb 5 09:25:49 2010
New Revision: 906868
URL: http://svn.apache.org/viewvc?rev=906868&view=rev
Log:
GERONIMO-5122 Apply patch of JIRA 4566 for Tomcat 6.0.24
Modified:
geronimo/external/trunk/tomcat-parent-6.0.24/util/src/main/java/org/apache/tomcat/util/http/mapper/Mapper.java
Modified: geronimo/external/trunk/tomcat-parent-6.0.24/util/src/main/java/org/apache/tomcat/util/http/mapper/Mapper.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.24/util/src/main/java/org/apache/tomcat/util/http/mapper/Mapper.java?rev=906868&r1=906867&r2=906868&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.24/util/src/main/java/org/apache/tomcat/util/http/mapper/Mapper.java (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.24/util/src/main/java/org/apache/tomcat/util/http/mapper/Mapper.java Fri Feb 5 09:25:49 2010
@@ -804,6 +804,31 @@
}
+ // welcome file processing - take 2
+ // take first matching welcome file that has an extension match
+ // a watered down version of rule 4
+ if (mappingData.wrapper == null) {
+ boolean checkWelcomeFiles = checkJspWelcomeFiles;
+ if (!checkWelcomeFiles) {
+ char[] buf = path.getBuffer();
+ checkWelcomeFiles = (buf[pathEnd - 1] == '/');
+ }
+ if (checkWelcomeFiles) {
+ for (int i = 0; (i < context.welcomeResources.length)
+ && (mappingData.wrapper == null); i++) {
+ path.setOffset(pathOffset);
+ path.setEnd(pathEnd);
+ path.append(context.welcomeResources[i], 0,
+ context.welcomeResources[i].length());
+ path.setOffset(servletPath);
+ internalMapExtensionWrapper(extensionWrappers,
+ path, mappingData);
+ }
+
+ path.setOffset(servletPath);
+ path.setEnd(pathEnd);
+ }
+ }
// Rule 7 -- Default servlet
if (mappingData.wrapper == null && !checkJspWelcomeFiles) {