luehe 2003/09/10 18:59:51
Modified: catalina/src/share/org/apache/catalina/util RequestUtil.java
Log:
Fix for 4918152 ("using % in the value of jsp:param corrupts the query string")
Patch provided by [EMAIL PROTECTED]
Revision Changes Path
1.5 +11 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/RequestUtil.java
Index: RequestUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/RequestUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RequestUtil.java 2 Sep 2003 21:22:06 -0000 1.4
+++ RequestUtil.java 11 Sep 2003 01:59:51 -0000 1.5
@@ -536,8 +536,13 @@
data[ox++] = (byte)' ';
break;
case '%':
- data[ox++] = (byte)((convertHexDigit(data[ix++]) << 4)
- + convertHexDigit(data[ix++]));
+ if ((ix <= (data.length - 2)) &&
+ ((char)data[ix] != '&') && ((char)data[ix+1] != '&')) {
+ data[ox++] = (byte)((convertHexDigit(data[ix++]) << 4)
+ + convertHexDigit(data[ix++]));
+ } else {
+ data[ox++] = c;
+ }
break;
default:
data[ox++] = c;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
