Author: markt Date: Thu Mar 23 12:22:26 2017 New Revision: 1788223 URL: http://svn.apache.org/viewvc?rev=1788223&view=rev Log: Fix some edge cases spotted while investigating BZ 60900. This change makes BZ 60900 easier to trigger.
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java?rev=1788223&r1=1788222&r2=1788223&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java (original) +++ tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java Thu Mar 23 12:22:26 2017 @@ -62,8 +62,12 @@ public abstract class AbstractProcessorL } else if (status == SocketEvent.OPEN_WRITE) { // Extra write event likely after async, ignore state = SocketState.LONG; - } else { + } else if (status == SocketEvent.OPEN_READ){ state = service(socketWrapper); + } else { + // Default to closing the socket if the SocketEvent passed in + // is not consistent with the current state of the Processor + state = SocketState.CLOSED; } if (state != SocketState.CLOSED && isAsync()) { Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1788223&r1=1788222&r2=1788223&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar 23 12:22:26 2017 @@ -103,6 +103,11 @@ <fix> Fix HTTP/2 incorrect input unblocking on EOF. (remm) </fix> + <fix> + Close the connection sooner if an event occurs for a current connection + that is not consistent with the current state of that connection. + (markt) + </fix> </changelog> </subsection> <subsection name="jdbc-pool"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org