Author: markt Date: Wed Jun 13 15:48:26 2012 New Revision: 1349923 URL: http://svn.apache.org/viewvc?rev=1349923&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53406 Fix possible stack overflow on connection close when using Comet (fhanik)
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1349922 Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1349923&r1=1349922&r2=1349923&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Wed Jun 13 15:48:26 2012 @@ -144,7 +144,7 @@ public class Http11AprProcessor extends rp.setStage(org.apache.coyote.Constants.STAGE_ENDED); - if (error) { + if (error || status==SocketStatus.STOP) { return SocketState.CLOSED; } else if (!comet) { inputBuffer.nextRequest(); Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1349923&r1=1349922&r2=1349923&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Wed Jun 13 15:48:26 2012 @@ -155,7 +155,7 @@ public class Http11NioProcessor extends rp.setStage(org.apache.coyote.Constants.STAGE_ENDED); - if (error) { + if (error || status==SocketStatus.STOP) { return SocketState.CLOSED; } else if (!comet) { if (keepAlive) { Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1349923&r1=1349922&r2=1349923&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jun 13 15:48:26 2012 @@ -308,6 +308,10 @@ Correct an edge case where Comet END events were not send to connected clients when the Tomcat connector was stopped. (markt) </fix> + <fix> + <bug>53406</bug>: Fix possible stack overflow on connection close when + using Comet. (fhanik) + </fix> </changelog> </subsection> <subsection name="Jasper"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org