remm 2003/10/01 04:44:24
Modified: coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java
Log:
- Port missing URL normalization patch.
Revision Changes Path
1.21 +9 -7
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
Index: CoyoteAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CoyoteAdapter.java 18 Sep 2003 20:53:01 -0000 1.20
+++ CoyoteAdapter.java 1 Oct 2003 11:44:24 -0000 1.21
@@ -533,9 +533,11 @@
// Replace "//" with "/"
for (pos = start; pos < (end - 1); pos++) {
- if ((b[pos] == (byte) '/') && (b[pos + 1] == (byte) '/')) {
- copyBytes(b, pos, pos + 1, end - pos - 1);
- end--;
+ if (b[pos] == (byte) '/') {
+ while ((pos + 1 < end) && (b[pos + 1] == (byte) '/')) {
+ copyBytes(b, pos, pos + 1, end - pos - 1);
+ end--;
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]