Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 56137 invoked from network); 15 Jun 2005 18:35:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Jun 2005 18:35:57 -0000 Received: (qmail 20472 invoked by uid 500); 15 Jun 2005 18:35:46 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 20427 invoked by uid 500); 15 Jun 2005 18:35:46 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 20412 invoked by uid 500); 15 Jun 2005 18:35:45 -0000 Received: (qmail 20409 invoked by uid 99); 15 Jun 2005 18:35:45 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 15 Jun 2005 11:35:44 -0700 Received: (qmail 28108 invoked by uid 1135); 15 Jun 2005 17:35:24 -0000 Date: 15 Jun 2005 17:35:24 -0000 Message-ID: <20050615173524.28107.qmail@minotaur.apache.org> From: remm@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp AjpAprProcessor.java X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org