svn commit: r1196231 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/ webapps/docs/

Author: kkolinko
Date: Tue Nov  1 19:29:30 2011
New Revision: 1196231

URL: http://svn.apache.org/viewvc?rev=1196231&view=rev
Log:
Merged revisions r1196212 r1196223 from tomcat/trunk:

Implement self-guard against unexpected call to parseHeaders() after the
parsing has already been completed
without a prior call to recycle() or nextRequest().
One such occurrence was caused by a bug that did not recycle the buffer and
was fixed a while ago.

AbstractHttp11Processor handling of ISE from parseHeaders() is to reject
the request with response status 400 and close the socket. The message is
visible only when debug logging is enabled in AbstractHttp11Processor.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
   
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
   
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
   
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
   
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/