You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@apache.org on 2001/03/30 22:44:21 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContextMapper.java
craigmcc 01/03/30 12:44:21
Modified: catalina/src/share/org/apache/catalina/core
StandardContextMapper.java
Log:
Use RequestUtil.URLDecode() instead of URLDecoder.decode() in order to
deal with character encoding issues correctly.
Submitted by: Remy Maucherat <re...@apache.org>
Revision Changes Path
1.3 +6 -6 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextMapper.java
Index: StandardContextMapper.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextMapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StandardContextMapper.java 2001/03/30 19:33:37 1.2
+++ StandardContextMapper.java 2001/03/30 20:44:20 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextMapper.java,v 1.2 2001/03/30 19:33:37 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2001/03/30 19:33:37 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextMapper.java,v 1.3 2001/03/30 20:44:20 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/03/30 20:44:20 $
*
* ====================================================================
*
@@ -65,7 +65,6 @@
package org.apache.catalina.core;
-import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
@@ -73,6 +72,7 @@
import org.apache.catalina.Mapper;
import org.apache.catalina.Request;
import org.apache.catalina.Wrapper;
+import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.StringManager;
@@ -85,7 +85,7 @@
* <code>StandardContext</code>, because it relies on internal APIs.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2001/03/30 19:33:37 $
+ * @version $Revision: 1.3 $ $Date: 2001/03/30 20:44:20 $
*/
public final class StandardContextMapper
@@ -203,7 +203,7 @@
// Decode the relative URI, because we will ultimately return both
// servletPath and pathInfo as decoded strings
try {
- relativeURI = URLDecoder.decode(relativeURI);
+ relativeURI = RequestUtil.URLDecode(relativeURI);
if (debug >= 1)
context.log("Decoded relativeURI='" + relativeURI + "'");
} catch (Exception e) {