[jbossweb-commits] JBossWeb SVN: r1664 - in trunk: webapps/docs and 1 other directory.
Author: remy.maucherat(a)jboss.com
Date: 2011-02-18 12:06:25 -0500 (Fri, 18 Feb 2011)
New Revision: 1664
Modified:
trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
trunk/java/org/apache/coyote/ajp/AjpProcessor.java
trunk/webapps/docs/changelog.xml
Log:
- 50189: AJP corruption fix when reading IS after closing OS.
Modified: trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
===================================================================
--- trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java 2011-02-15 17:42:04 UTC (rev
1663)
+++ trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java 2011-02-18 17:06:25 UTC (rev
1664)
@@ -1214,6 +1214,9 @@
if (endOfStream) {
return false;
}
+ if (finished) {
+ return false;
+ }
// Request more data immediately
Socket.sendb(socket, getBodyMessageBuffer, 0,
Modified: trunk/java/org/apache/coyote/ajp/AjpProcessor.java
===================================================================
--- trunk/java/org/apache/coyote/ajp/AjpProcessor.java 2011-02-15 17:42:04 UTC (rev 1663)
+++ trunk/java/org/apache/coyote/ajp/AjpProcessor.java 2011-02-18 17:06:25 UTC (rev 1664)
@@ -1181,6 +1181,9 @@
if (endOfStream) {
return false;
}
+ if (finished) {
+ return false;
+ }
// Request more data immediately
output.write(getBodyMessageArray);
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2011-02-15 17:42:04 UTC (rev 1663)
+++ trunk/webapps/docs/changelog.xml 2011-02-18 17:06:25 UTC (rev 1664)
@@ -43,6 +43,10 @@
<fix>
<bug>47319</bug>: Fix getRemoteHost() with APR when name cannot be
resolved. (markt)
</fix>
+ <fix>
+ <bug>50189</bug>: Fix AJP protocol corruption if a webapp reads from
the request after closing
+ the response. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">