Author: remm
Date: Wed Nov 5 10:56:02 2014
New Revision: 1636851
URL: http://svn.apache.org/r1636851
Log:
57187: Add specific handling for special * URL since the new resources don't
just ignore it anymore.
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=1636851&r1=1636850&r2=1636851&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java Wed Nov 5
10:56:02 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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
