Author: remm
Date: Mon Aug 28 02:26:51 2006
New Revision: 437620
URL: http://svn.apache.org/viewvc?rev=437620&view=rev
Log:
- Adjust content length fix so that it does the same as for the HTTP connector.
Modified:
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/java/org/apache/jk/core/MsgContext.java
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=437620&r1=437619&r2=437620&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 Mon
Aug 28 02:26:51 2006
@@ -571,9 +571,9 @@
} else if (actionCode == ActionCode.ACTION_REQ_SET_BODY_REPLAY) {
// Set the given bytes as the content
- request.setContentLength(-1); // reset content length
ByteChunk bc = (ByteChunk) param;
bodyBytes.setBytes(bc.getBytes(), bc.getStart(), bc.getLength());
+ request.setContentLength(bc.getLength());
first = false;
empty = false;
replay = true;
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=437620&r1=437619&r2=437620&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 Mon Aug
28 02:26:51 2006
@@ -543,6 +543,7 @@
// Set the given bytes as the content
ByteChunk bc = (ByteChunk) param;
bodyBytes.setBytes(bc.getBytes(), bc.getStart(), bc.getLength());
+ request.setContentLength(bc.getLength());
first = false;
empty = false;
replay = true;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/core/MsgContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/core/MsgContext.java?rev=437620&r1=437619&r2=437620&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/core/MsgContext.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/core/MsgContext.java Mon Aug 28
02:26:51 2006
@@ -351,8 +351,8 @@
} else if ( actionCode == ActionCode.ACTION_REQ_SET_BODY_REPLAY ) {
if( log.isTraceEnabled() )
log.trace("Replay ");
- req.setContentLength(-1); // reset content length
ByteChunk bc = (ByteChunk)param;
+ req.setContentLength(bc.getLength());
jkIS.setReplay(bc);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
