Author: markt
Date: Tue Jun 17 12:45:12 2014
New Revision: 1603152
URL: http://svn.apache.org/r1603152
Log:
Follow-up to r1602510 after kkolinko review.
Add patch chunk missed in backport
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1603152&r1=1603151&r2=1603152&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Tue Jun
17 12:45:12 2014
@@ -590,7 +590,10 @@ public abstract class AbstractProtocol<S
SocketState state = SocketState.CLOSED;
do {
- if (status == SocketStatus.DISCONNECT &&
+ if (status == SocketStatus.CLOSE_NOW) {
+ processor.errorDispatch();
+ state = SocketState.CLOSED;
+ } else if (status == SocketStatus.DISCONNECT &&
!processor.isComet()) {
// Do nothing here, just wait for it to get recycled
// Don't do this for Comet we need to generate an end
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
