remm 2005/06/15 10:35:24
Modified: jk/java/org/apache/coyote/ajp AjpAprProcessor.java
Log:
- Fix uploading.
Revision Changes Path
1.3 +7 -9
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AjpAprProcessor.java 15 Jun 2005 15:27:33 -0000 1.2
+++ AjpAprProcessor.java 15 Jun 2005 17:35:24 -0000 1.3
@@ -86,9 +86,6 @@
// Cause loading of HexUtils
int foo = HexUtils.DEC[0];
- readBodyMessage.appendByte(Constants.JK_AJP13_GET_BODY_CHUNK);
- readBodyMessage.appendInt(Constants.MAX_READ_SIZE);
-
}
@@ -1031,14 +1028,10 @@
public boolean receive() throws IOException {
first = false;
bodyMessage.reset();
- boolean err = readMessage(bodyMessage, false);
+ readMessage(bodyMessage, false);
if( log.isDebugEnabled() )
- log.info( "Receiving: getting request body chunk " + err + " " +
bodyMessage.getLen() );
+ log.info( "Receiving: getting request body chunk " +
bodyMessage.getLen() );
- if(err) {
- throw new IOException();
- }
-
// No data received.
if( bodyMessage.getLen() == 0 ) { // just the header
// Don't mark 'end of stream' for the first chunk.
@@ -1083,6 +1076,9 @@
}
// Why not use outBuf??
+ readBodyMessage.reset();
+ readBodyMessage.appendByte(Constants.JK_AJP13_GET_BODY_CHUNK);
+ readBodyMessage.appendInt(Constants.MAX_READ_SIZE);
writeMessage(readBodyMessage);
// In JNI mode, response will be in bodyMsg. In TCP mode, response
need to be
@@ -1172,6 +1168,8 @@
// Recycle Request object
first = true;
+ endOfStream = false;
+ empty = true;
request.recycle();
response.recycle();
headerMessage.reset();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
