You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2015/06/12 17:43:17 UTC
svn commit: r1685108 - in /tomcat/tc8.0.x/trunk:
java/org/apache/coyote/ajp/AbstractAjpProcessor.java
webapps/docs/changelog.xml
Author: remm
Date: Fri Jun 12 15:43:16 2015
New Revision: 1685108
URL: http://svn.apache.org/r1685108
Log:
58004: AJP would buffer data even in blocking mode, leading to leaking. Should not affect trunk from what I can see.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1685108&r1=1685107&r2=1685108&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Fri Jun 12 15:43:16 2015
@@ -1648,7 +1648,7 @@ public abstract class AbstractAjpProcess
bytesWritten += off;
- if (len > 0) {
+ if (len > 0 && !blocking) {
// Add this chunk to the buffer
addToBuffers(chunk.getBuffer(), off, len);
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1685108&r1=1685107&r2=1685108&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Fri Jun 12 15:43:16 2015
@@ -109,6 +109,10 @@
Support "-" separator in the SSLProtocol configuration of the
APR/native connector for protocol exclusion. (rjung)
</add>
+ <fix>
+ <bug>58004</bug>: Fix AJP buffering output data even in blocking mode.
+ (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org