Author: remy.maucherat(a)jboss.com Date: 2008-01-04 12:17:44 -0500 (Fri, 04 Jan 2008) New Revision: 387 Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java trunk/java/org/apache/coyote/http11/Http11Processor.java trunk/webapps/docs/changelog.xml Log: - No input swallowing when there's an error. It's quite experimental since this may cause delays or problems when closing the socket. Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-01-03 10:43:08 UTC (rev 386) +++ trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-01-04 17:17:44 UTC (rev 387) @@ -924,6 +924,10 @@ } // Finish the handling of the request + if (error) { + // If there is an unspecified error, the connection will be closed + inputBuffer.setSwallowInput(false); + } if (!comet) { endRequest(); } Modified: trunk/java/org/apache/coyote/http11/Http11Processor.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11Processor.java 2008-01-03 10:43:08 UTC (rev 386) +++ trunk/java/org/apache/coyote/http11/Http11Processor.java 2008-01-04 17:17:44 UTC (rev 387) @@ -863,6 +863,10 @@ } // Finish the handling of the request + if (error) { + // If there is an unspecified error, the connection will be closed + inputBuffer.setSwallowInput(false); + } try { rp.setStage(org.apache.coyote.Constants.STAGE_ENDINPUT); inputBuffer.endRequest(); Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-01-03 10:43:08 UTC (rev 386) +++ trunk/webapps/docs/changelog.xml 2008-01-04 17:17:44 UTC (rev 387) @@ -124,6 +124,10 @@ <bug>44084</bug>: JASSRealm was broken for application provided Principals. Patch provided by Noah Levitt. (markt) </fix> + <fix> + <bug>43914</bug>: URLs in location headers should be encoded. Patch + provided by Ivan Todoroski. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote"> @@ -142,6 +146,9 @@ <bug>43622</bug>: Don't overwrite the min compression size set by the compression attribute with the default. (markt) </fix> + <fix> + No need to swallow input if there is an error. (remm) + </fix> </changelog> </subsection> <subsection name="Jasper">