Author: remm
Date: Tue Apr 1 22:41:54 2014
New Revision: 1583814
URL: http://svn.apache.org/r1583814
Log:
56336: Fix apparent AJP output issue [untested and unverified, no test case].
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1583814&r1=1583813&r2=1583814&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Tue Apr
1 22:41:54 2014
@@ -1656,7 +1656,7 @@ public abstract class AbstractAjpProcess
while (written > 0 && responseMsgPos < len) {
written = output(
- responseMessage.getBuffer(), responseMsgPos, len, block);
+ responseMessage.getBuffer(), responseMsgPos, len -
responseMsgPos, block);
responseMsgPos += written;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1583814&r1=1583813&r2=1583814&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr 1 22:41:54 2014
@@ -77,6 +77,9 @@
<fix>
More cleanup of NIO2 endpoint shutdown. (remm)
</fix>
+ <fix>
+ <bug>56336</bug>: AJP output corruption and errors. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]