luehe 2003/03/12 12:56:11
Modified: coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
Log:
Remove any URI parameters from the request URI, so they won't be considered by
the wrapper/context mapping algorithm
Revision Changes Path
1.13 +17 -6
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CoyoteAdapter.java 12 Mar 2003 07:50:38 -0000 1.12
+++ CoyoteAdapter.java 12 Mar 2003 20:56:11 -0000 1.13
@@ -272,8 +272,19 @@
// URI character decoding
convertURI(req.decodedURI(), request);
- // Request mapping
- connector.getMapper().map(req.serverName(), req.decodedURI(),
+ /*
+ * Request mapping.
+ * Remove any remaining parameters (other than session id, which has
+ * already been removed in parseSessionId()) from the URI, so they
+ * won't be considered by the mapping algorithm.
+ */
+ MessageBytes decodedURI = req.decodedURI();
+ CharChunk uriCC = decodedURI.getCharChunk();
+ int semicolon = uriCC.indexOf(';');
+ if (semicolon > 0) {
+ decodedURI.setString(uriCC.toString().substring(0, semicolon));
+ }
+ connector.getMapper().map(req.serverName(), decodedURI,
request.getMappingData());
request.setContext((Context) request.getMappingData().context);
request.setWrapper((Wrapper) request.getMappingData().wrapper);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
