Author: markt
Date: Tue Mar 20 21:52:07 2012
New Revision: 1303171
URL: http://svn.apache.org/viewvc?rev=1303171&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52606
Ensure replayed POST bodies are available when using AJP
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1303171&r1=1303170&r2=1303171&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar 20 21:52:07 2012
@@ -104,12 +104,6 @@ PATCHES PROPOSED TO BACKPORT:
-0: markt - https://issues.apache.org/bugzilla/show_bug.cgi?id=52579#c8
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52606
- Ensure replayed POST bodies are available when using AJP
- http://svn.apache.org/viewvc?rev=1241985&view=rev
- +1: markt, kfujino, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51477
Support all SSL/TLS protocol combinations in APR connector.
trunk/TC7 (applies clean except for docs):
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1303171&r1=1303170&r2=1303171&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Tue
Mar 20 21:52:07 2012
@@ -631,7 +631,7 @@ public class AjpAprProcessor implements
first = false;
empty = false;
replay = true;
-
+ endOfStream = false;
}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1303171&r1=1303170&r2=1303171&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Mar
20 21:52:07 2012
@@ -636,7 +636,7 @@ public class AjpProcessor implements Act
first = false;
empty = false;
replay = true;
-
+ endOfStream = false;
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1303171&r1=1303170&r2=1303171&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Mar 20 21:52:07 2012
@@ -109,6 +109,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ <bug>52606</bug>: Ensure replayed POST bodies are available when using
+ AJP. (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
