You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2003/12/02 15:48:50 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/servlet CocoonServlet.java
vgritsenko 2003/12/02 06:48:50
Modified: src/java/org/apache/cocoon/servlet CocoonServlet.java
Log:
Fix bug 25132: Do not double decode URI in CocoonServlet
Revision Changes Path
1.23 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/servlet/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- CocoonServlet.java 21 Oct 2003 13:54:03 -0000 1.22
+++ CocoonServlet.java 2 Dec 2003 14:48:50 -0000 1.23
@@ -87,7 +87,6 @@
import java.net.MalformedURLException;
import java.net.SocketException;
import java.net.URL;
-import java.net.URLDecoder;
import java.util.*;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
@@ -1029,7 +1028,8 @@
if (uri.charAt(0) == '/') {
uri = uri.substring(1);
}
- env = getEnvironment(URLDecoder.decode(uri), request, res);
+ // Pass uri into environment without URLDecoding, as it is already decoded.
+ env = getEnvironment(uri, request, res);
} catch (Exception e) {
if (getLogger().isErrorEnabled()) {
getLogger().error("Problem with Cocoon servlet", e);