Author: kkolinko
Date: Wed Mar 3 15:53:13 2010
New Revision: 918534
URL: http://svn.apache.org/viewvc?rev=918534&view=rev
Log:
Remove unneeded line from the method that normalizes decodedURI.
The line "uriBC.setBytes(b, start, end);" is wrong, as it should have been
"uriBC.setBytes(b, start, end - start);". I suppose that it worked because in
the only place that calls this normalize() method the value of 'start' was
always equal to zero.
Instead of fixing, I am removing that line, because it actually is not needed
there at all, thanks to the uriBC.setEnd() calls above it.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=918534&r1=918533&r2=918534&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar 3 15:53:13 2010
@@ -134,11 +134,6 @@
+1: markt, kkolinko, rjung
-1:
-* Remove unneeded line from the method that normalizes decodedURI.
- http://svn.apache.org/viewvc?rev=892812&view=rev
- +1: kkolinko, markt, rjung
- -1:
-
* Update Tomcat-Native included in TC distributives to 1.1.19
http://people.apache.org/~kkolinko/patches/2010-01-27_tc55_native-x19.patch
+1: kkolinko, markt
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java?rev=918534&r1=918533&r2=918534&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
Wed Mar 3 15:53:13 2010
@@ -539,8 +539,8 @@
public static boolean normalize(MessageBytes uriMB) {
ByteChunk uriBC = uriMB.getByteChunk();
- byte[] b = uriBC.getBytes();
- int start = uriBC.getStart();
+ final byte[] b = uriBC.getBytes();
+ final int start = uriBC.getStart();
int end = uriBC.getEnd();
// An empty URL is not acceptable
@@ -633,8 +633,6 @@
index = index2;
}
- uriBC.setBytes(b, start, end);
-
return true;
}
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=918534&r1=918533&r2=918534&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Mar 3
15:53:13 2010
@@ -172,6 +172,10 @@
CVE-2009-3555. Provide option to disable legacy SSL renegotiation.
(markt/costin)
</fix>
+ <fix>
+ Remove unneeded line from the method that normalizes decodedURI.
+ (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
