Author: markt Date: Fri Oct 4 12:55:32 2013 New Revision: 1529149 URL: http://svn.apache.org/r1529149 Log: Re-check error state after service method regardless of keep-alive to ensure unused input is not swallowed on error. This allows the socket to be closed as quickly as possible.
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1529149&r1=1529148&r2=1529149&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Fri Oct 4 12:55:32 2013 @@ -1015,7 +1015,7 @@ public abstract class AbstractHttp11Proc // set the status to 500 and set the errorException. // If we fail here, then the response is likely already // committed, so we can't try and set headers. - if(keepAlive && !error) { // Avoid checking twice. + if(!error) { // Avoid checking twice. error = response.getErrorException() != null || (!isAsync() && statusDropsConnection(response.getStatus())); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org