Author: markt
Date: Sat Dec 27 11:31:09 2008
New Revision: 729659
URL: http://svn.apache.org/viewvc?rev=729659&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46125
Return 400 if headers are too big
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 27 11:31:09 2008
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126,711600,712461,718360
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710125,710205,711126,711600,712461,718360,726052
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=729659&r1=729658&r2=729659&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Dec 27 11:31:09 2008
@@ -136,14 +136,6 @@
really old to me, so where would this come from ?)
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46125
- Change the exception to cause a 400 status code if the request headers are
too
- big
- http://svn.apache.org/viewvc?rev=709811&view=rev
- http://svn.apache.org/viewvc?rev=726052&view=rev
- +1: markt, remm (with a trivial improvement), fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41861
Add major version number to Tomcat service name created by Windows installer
http://svn.apache.org/viewvc?rev=710066&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=729659&r1=729658&r2=729659&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Sat Dec 27 11:31:09 2008
@@ -751,7 +751,7 @@
if (parsingHeader) {
if (lastValid == buf.length) {
- throw new IOException
+ throw new IllegalArgumentException
(sm.getString("iib.requestheadertoolarge.error"));
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java?rev=729659&r1=729658&r2=729659&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
Sat Dec 27 11:31:09 2008
@@ -723,7 +723,7 @@
if (parsingHeader) {
if (lastValid == buf.length) {
- throw new IOException
+ throw new IllegalArgumentException
(sm.getString("iib.requestheadertoolarge.error"));
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=729659&r1=729658&r2=729659&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
Sat Dec 27 11:31:09 2008
@@ -876,7 +876,7 @@
if (parsingHeader) {
if (lastValid == buf.length) {
- throw new IOException
+ throw new IllegalArgumentException
(sm.getString("iib.requestheadertoolarge.error"));
}
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=729659&r1=729658&r2=729659&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Dec 27 11:31:09 2008
@@ -231,7 +231,10 @@
<add>
Don't swallow input if we know the connection is going to be closed.
(billbarker)
</add>
-
+ <fix>
+ <bug>46125</bug>: Return a status code of 400 if the request headers
are
+ too large. (markt)
+ </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
