Author: jfrederic.clere(a)jboss.com
Date: 2011-09-09 11:42:45 -0400 (Fri, 09 Sep 2011)
New Revision: 1837
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/ajp/AjpAprProcessor.java
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/ajp/AjpProcessor.java
Log:
Arrange the patch we had long ago for a customer case.
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/ajp/AjpAprProcessor.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/ajp/AjpAprProcessor.java 2011-09-09
15:40:08 UTC (rev 1836)
+++
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/ajp/AjpAprProcessor.java 2011-09-09
15:42:45 UTC (rev 1837)
@@ -386,7 +386,8 @@
if(log.isDebugEnabled()) {
log.debug("Unexpected message: "+type);
}
- continue;
+ error = true;
+ break;
}
keptAlive = true;
@@ -994,7 +995,7 @@
flush();
// read remaining data from the special first-body-chunk
- if (first && request.getContentLength() > 0) {
+ if (first && request.getContentLengthLong() > 0) {
try {
receive();
} catch (IOException e) {
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/ajp/AjpProcessor.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/ajp/AjpProcessor.java 2011-09-09
15:40:08 UTC (rev 1836)
+++
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/ajp/AjpProcessor.java 2011-09-09
15:42:45 UTC (rev 1837)
@@ -405,7 +405,8 @@
if(log.isDebugEnabled()) {
log.debug("Unexpected message: "+type);
}
- continue;
+ error = true;
+ break;
}
request.setStartTime(System.currentTimeMillis());
@@ -997,7 +998,7 @@
// read remaining data from the special first-body-chunk
- if (first && request.getContentLength() > 0) {
+ if (first && request.getContentLengthLong() > 0) {
try {
receive();
} catch (IOException e) {