Attachment 24065 Details for Bug 47378 – Patch against tomcat 6.0

[patch] Patch against tomcat 6.0

Mapper.java.patch (text/plain), 1.63 KB, created by Tim Funk on 2009-07-30 08:01:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Funk

Created: 2009-07-30 08:01:55 UTC

Size: 1.63 KB

patch

obsolete

>Index: java/org/apache/tomcat/util/http/mapper/Mapper.java
>===================================================================
>--- java/org/apache/tomcat/util/http/mapper/Mapper.java	(revision 799301)
>+++ java/org/apache/tomcat/util/http/mapper/Mapper.java	(working copy)
>@@ -804,7 +804,33 @@
>                                         
>         }
> 
>+        // 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) {
>             if (context.defaultWrapper != null) {

Actions: View | Diff

Attachments on bug 47378: 24065 | 24088