Author: kkolinko
Date: Fri Nov 25 21:11:35 2011
New Revision: 1206324
URL: http://svn.apache.org/viewvc?rev=1206324&view=rev
Log:
Parameters.java:
- Fix regression in urldecoding of parameters that contain spaces
Patch by Willem Fibbe
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1206324&r1=1206323&r2=1206324&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 25 21:11:35 2011
@@ -113,12 +113,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko
-1:
-* Fix regression in urldecoding of parameters that contain spaces
- http://svn.apache.org/viewvc?rev=1202705&view=rev
- (Parameters.java only)
- +1: kkolinko, rjung, jfclere
- -1:
-
* Reduce overhead from exception handling in UDecoder
http://people.apache.org/~kkolinko/patches/2011-11-17_tc6_UDecoder.patch
(r1203054 in TC7)
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1206324&r1=1206323&r2=1206324&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java Fri
Nov 25 21:11:35 2011
@@ -278,6 +278,7 @@ public final class Parameters {
pos++;
break;
case '%':
+ case '+':
// Decoding required
if (parsingName) {
decodeName = true;
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1206324&r1=1206323&r2=1206324&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Nov 25 21:11:35 2011
@@ -43,7 +43,17 @@
<!-- Section names:
General, Catalina, Coyote, Jasper, Cluster, Webapps, Other
-->
-<section name="Tomcat 6.0.34 (jfclere)">
+<section name="Tomcat 6.0.35 (jfclere)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Fix regression in decoding of parameters that contain spaces.
+ Patch by Willem Fibbe. (kkolinko)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+<section name="Tomcat 6.0.34 (jfclere)" rtext="not released">
<subsection name="Catalina">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
