Author: markt
Date: Fri Feb 21 12:12:33 2014
New Revision: 1570548
URL: http://svn.apache.org/r1570548
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56172
Avoid possible request corruption when using the AJP NIO connector and a
request is sent using more than one AJP message.
Patch provided by Amund Elstad.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1570547
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1570548&r1=1570547&r2=1570548&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Fri
Feb 21 12:12:33 2014
@@ -328,7 +328,7 @@ public class AjpNioProcessor extends Abs
boolean block = blockFirstRead;
while (read < n) {
- res = readSocket(buf, read + pos, n, block);
+ res = readSocket(buf, read + pos, n - read, block);
if (res > 0) {
read += res;
} else if (res == 0 && !block) {
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=1570548&r1=1570547&r2=1570548&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Feb 21 12:12:33 2014
@@ -70,6 +70,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ <bug>56172</bug>: Avoid possible request corruption when using the AJP
+ NIO connector and a request is sent using more than one AJP message.
+ Patch provided by Amund Elstad. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Jasper">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
