remm 2002/10/09 05:40:53
Modified: catalina/src/share/org/apache/catalina/core
StandardWrapperValve.java
Log:
- The decoded URI should be used there.
Revision Changes Path
1.5 +15 -10
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java
Index: StandardWrapperValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StandardWrapperValve.java 12 Sep 2002 00:09:27 -0000 1.4
+++ StandardWrapperValve.java 9 Oct 2002 12:40:53 -0000 1.5
@@ -248,16 +248,21 @@
String contextPath = hreq.getContextPath();
if (contextPath == null)
contextPath = "";
- String requestURI = hreq.getRequestURI();
+ String requestURI = ((HttpRequest) hreq).getDecodedRequestURI();
if (requestURI.length() >= contextPath.length())
requestPath = requestURI.substring(contextPath.length());
}
- sreq.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
- new
Integer(ApplicationFilterFactory.REQUEST));
- sreq.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
requestPath);
+ sreq.setAttribute
+ (ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
+ new Integer(ApplicationFilterFactory.REQUEST));
+ sreq.setAttribute
+ (ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
+ requestPath);
// Create the filter chain for this request
- ApplicationFilterFactory factory = ApplicationFilterFactory.getInstance();
- ApplicationFilterChain filterChain = factory.createFilterChain(sreq,
wrapper, servlet);
+ ApplicationFilterFactory factory =
+ ApplicationFilterFactory.getInstance();
+ ApplicationFilterChain filterChain =
+ factory.createFilterChain(sreq, wrapper, servlet);
// Call the filter chain for this request
// NOTE: This also calls the servlet's service() method
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
