On 14/01/2016 03:08, Konstantin Kolinko wrote: > 2016-01-13 18:02 GMT+03:00 <ma...@apache.org>: >> Author: markt >> Date: Wed Jan 13 15:02:00 2016 >> New Revision: 1724437
<snip/> >> Modified: >> tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java <snip/> > Imports order... Fixed. <snip/> > Looking into Parameters.handleQueryParameters() on how it deals with > MessageBytes that wraps a String. It calls "data.toBytes()" which > uses System Default encoding (see MessageBytes.toBytes() in Tomcat 6 > and Tomcat 7, Tomcat 8 onward is different). The > RequestUtil.parseParameters() method called by the old code uses the > specified encoding. Nice catch. Fixed. > As RequestUtil.parseParameters() method is no longer used, mark it as > @Deprecated. I have a bunch of deprecation markers I need to back-port including this one. I only plan to back-port them to the version before they are removed. i.e. 8.0.x in most cases. >> 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=1724437&r1=1724436&r2=1724437&view=diff >> ============================================================================== >> --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) >> +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 13 15:02:00 2016 >> @@ -107,6 +107,11 @@ >> Remove redundant copy of catalina.properties from o.a.c.startup. >> Generate this copy during the ant "compile" task. (kkolinko) >> </fix> >> + <fix> >> + <bug>58836</bug>: Correctly merge query string parameters when >> + processing a forwarded request where the target includes a query >> string >> + that contains a parameter with no value. (mark) > > Name typo... You'd think I could type my own name... I'll get that fixed shortly. Thanks again for the review. Mark --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org