remm 2005/07/27 12:29:16
Modified: jk/java/org/apache/coyote/ajp AjpAprProcessor.java
Log:
- After flushing, it's a good idea to write the data.
- I did spend most time testing uploading, as obviously it's trivial to not
mess
up downloading.
Revision Changes Path
1.11 +7 -8
jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
Index: AjpAprProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AjpAprProcessor.java 26 Jul 2005 16:13:33 -0000 1.10
+++ AjpAprProcessor.java 27 Jul 2005 19:29:16 -0000 1.11
@@ -1394,15 +1394,14 @@
if (outputBuffer.position() + thisTime
+ bodyMessage.getHeaderLength() + 4 >
outputBuffer.capacity()) {
flush();
- } else {
- outputBuffer.put((byte) 0x41);
- outputBuffer.put((byte) 0x42);
- outputBuffer.putShort((short) (thisTime + 4));
- outputBuffer.put(AjpConstants.JK_AJP13_SEND_BODY_CHUNK);
- outputBuffer.putShort((short) chunk.getLength());
- outputBuffer.put(chunk.getBytes(), chunk.getOffset() +
off, thisTime);
- outputBuffer.put((byte) 0x00);
}
+ outputBuffer.put((byte) 0x41);
+ outputBuffer.put((byte) 0x42);
+ outputBuffer.putShort((short) (thisTime + 4));
+ outputBuffer.put(AjpConstants.JK_AJP13_SEND_BODY_CHUNK);
+ outputBuffer.putShort((short) chunk.getLength());
+ outputBuffer.put(chunk.getBytes(), chunk.getOffset() + off,
thisTime);
+ outputBuffer.put((byte) 0x00);
off += thisTime;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
