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...@locus.apache.org on 2000/07/18 01:47:57 UTC
cvs commit: jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/http HttpProcessor.java
craigmcc 00/07/17 16:47:57
Modified: proposals/catalina/src/share/org/apache/tomcat/connector/http
HttpProcessor.java
Log:
Patch Catalina to perform URL decoding on the request URI (and query string),
analogous to the patch just submitted for the Tomcat main branch.
Revision Changes Path
1.15 +14 -5 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/http/HttpProcessor.java
Index: HttpProcessor.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/http/HttpProcessor.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- HttpProcessor.java 2000/06/22 00:19:05 1.14
+++ HttpProcessor.java 2000/07/17 23:47:56 1.15
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/http/HttpProcessor.java,v 1.14 2000/06/22 00:19:05 craigmcc Exp $
- * $Revision: 1.14 $
- * $Date: 2000/06/22 00:19:05 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/http/HttpProcessor.java,v 1.15 2000/07/17 23:47:56 craigmcc Exp $
+ * $Revision: 1.15 $
+ * $Date: 2000/07/17 23:47:56 $
*
* ====================================================================
*
@@ -71,6 +71,7 @@
import java.io.OutputStream;
import java.net.InetAddress;
import java.net.Socket;
+import java.net.URLDecoder;
import java.util.NoSuchElementException;
import java.util.StringTokenizer;
import java.util.Locale;
@@ -104,7 +105,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.14 $ $Date: 2000/06/22 00:19:05 $
+ * @version $Revision: 1.15 $ $Date: 2000/07/17 23:47:56 $
*/
final class HttpProcessor
@@ -573,7 +574,15 @@
String uri = null;
try {
uri = st.nextToken();
- ; // FIXME - URL decode the URI?
+ if ((uri != null) &&
+ ((uri.indexOf('%') >= 0) || (uri.indexOf('+') >= 0))) {
+ try {
+ uri = URLDecoder.decode(uri);
+ } catch (Exception e) {
+ throw new ServletException
+ (sm.getString("httpProcessor.parseRequest.decode"));
+ }
+ }
} catch (NoSuchElementException e) {
uri = null;
}