Author: remm
Date: Wed Nov  5 10:55:44 2014
New Revision: 1636850

URL: http://svn.apache.org/r1636850
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57187
57187: Add specific handling for special * URL since the new resources don't 
just ignore it anymore.

Modified:
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/mapper/Mapper.java
    tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/mapper/Mapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1636850&r1=1636849&r2=1636850&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/mapper/Mapper.java Wed Nov  5 
10:55:44 2014
@@ -846,6 +846,15 @@ public final class Mapper {
 
         path.setOffset(servletPath);
 
+        if ((pathEnd - pathOffset) == 1 && path.getBuffer()[pathOffset] == 
'*') {
+            // Special "*" URL
+            if (contextVersion.defaultWrapper != null) {
+                mappingData.wrapper = contextVersion.defaultWrapper.object;
+                mappingData.wrapperPath.setString("*");
+            }
+            return;
+        }
+
         // Rule 1 -- Exact Match
         MappedWrapper[] exactWrappers = contextVersion.exactWrappers;
         internalMapExactWrapper(exactWrappers, path, mappingData);

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1636850&r1=1636849&r2=1636850&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Nov  5 10:55:44 2014
@@ -45,6 +45,13 @@
   issues to not "pop up" wrt. others).
 -->
 <section name="Tomcat 8.0.16 (markt)">
+  <subsection name="Catalina">
+    <changelog>
+      <fix>
+        <bug>57187</bug>: Regression handling the special * URL. (remm)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Coyote">
     <changelog>
       <fix>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to