Author: kkolinko
Date: Thu Mar 15 17:30:35 2012
New Revision: 1301107
URL: http://svn.apache.org/viewvc?rev=1301107&view=rev
Log:
Reduce log level for message for hitting parameter count limit from warn to
info.
Fix limit comparison to allow exactly (maxParameterCount) parameters, instead
of (maxParameterCount-1).
Backports r1224665 from 7.0.x, r1224663 from trunk.
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=1301107&r1=1301106&r2=1301107&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar 15 17:30:35 2012
@@ -90,14 +90,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, rjung, kfujino
-1:
-* Reduce log level for the message about hitting maxParameterCount limit
- from WARN to INFO and fix comparison of parameterCount vs limit that
- triggers this message.
-
http://people.apache.org/~kkolinko/patches/2012-01-16_tc6_Parameters_maxCountFail.patch
- (backport of http://svn.apache.org/viewvc?rev=1224665&view=rev)
- +1: kkolinko, rjung, kfujino
- -1:
-
* Improvements to Windows installer:
1. When building a Windows installer do not copy whole "res" folder to
output/dist, but only the files that we need. Make sure that
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=1301107&r1=1301106&r2=1301107&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 Thu
Mar 15 17:30:35 2012
@@ -237,9 +237,9 @@ public final class Parameters {
while(pos < end) {
parameterCount ++;
- if (limit > -1 && parameterCount >= limit) {
+ if (limit > -1 && parameterCount > limit) {
parseFailed = true;
- log.warn(sm.getString("parameters.maxCountFail",
+ log.info(sm.getString("parameters.maxCountFail",
Integer.valueOf(limit)));
break;
}
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=1301107&r1=1301106&r2=1301107&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Mar 15 17:30:35 2012
@@ -96,6 +96,13 @@
<bug>52488</bug>: Correct typos: exipre -> expire. Based on a patch by
prockter. (markt)
</fix>
+ <fix>
+ Reduce log level for the message about hitting
+ <code>maxParameterCount</code> limit from WARN to INFO.
+ Fix limit comparison to allow exactly <code>maxParameterCount</code>
+ parameters, as documentation says, instead of
+ <code>(maxParameterCount-1)</code>. (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
