You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pe...@apache.org on 2006/12/13 11:26:25 UTC
svn commit: r486585 -
/tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
Author: pero
Date: Wed Dec 13 02:26:24 2006
New Revision: 486585
URL: http://svn.apache.org/viewvc?view=rev&rev=486585
Log:
Revert patch that ajp can use more then 8k packets at a response.
Modified:
tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
Modified: tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java?view=diff&rev=486585&r1=486584&r2=486585
==============================================================================
--- tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java Wed Dec 13 02:26:24 2006
@@ -84,7 +84,7 @@
response = new Response();
response.setHook(this);
- response.setOutputBuffer(new SocketOutputBuffer(packetSize));
+ response.setOutputBuffer(new SocketOutputBuffer());
request.setResponse(response);
requestHeaderMessage = new AjpMessage(packetSize);
@@ -108,17 +108,7 @@
// Cause loading of HttpMessages
HttpMessages.getMessage(200);
- // Set the get body message buffer
- AjpMessage getBodyMessage = new AjpMessage(128);
- getBodyMessage.reset();
- getBodyMessage.appendByte(Constants.JK_AJP13_GET_BODY_CHUNK);
- getBodyMessage.appendInt(packetSize - Constants.H_SIZE - 2);
- getBodyMessage.end();
- getBodyMessageBuffer = ByteBuffer.allocateDirect(getBodyMessage
- .getLen());
- getBodyMessageBuffer.put(getBodyMessage.getBuffer(), 0, getBodyMessage
- .getLen());
- }
+ }
// ----------------------------------------------------- Instance Variables
@@ -262,7 +252,7 @@
/**
* Direct buffer used for sending right away a get body message.
*/
- protected ByteBuffer getBodyMessageBuffer;
+ protected static final ByteBuffer getBodyMessageBuffer;
/**
@@ -286,6 +276,16 @@
static {
+ // Set the get body message buffer
+ AjpMessage getBodyMessage = new AjpMessage(128);
+ getBodyMessage.reset();
+ getBodyMessage.appendByte(Constants.JK_AJP13_GET_BODY_CHUNK);
+ getBodyMessage.appendInt(Constants.MAX_READ_SIZE);
+ getBodyMessage.end();
+ getBodyMessageBuffer = ByteBuffer.allocateDirect(getBodyMessage
+ .getLen());
+ getBodyMessageBuffer.put(getBodyMessage.getBuffer(), 0, getBodyMessage
+ .getLen());
// Set the read body message buffer
AjpMessage pongMessage = new AjpMessage(128);
@@ -1250,12 +1250,6 @@
*/
protected class SocketOutputBuffer
implements OutputBuffer {
-
- int maxSendPacketSize;
-
- SocketOutputBuffer(int maxSendSize) {
- this.maxSendPacketSize = maxSendSize - Constants.H_SIZE - 4;
- }
/**
* Write chunk.
@@ -1275,7 +1269,7 @@
int len = chunk.getLength();
// 4 - hardcoded, byte[] marshalling overhead
- int chunkSize = maxSendPacketSize;
+ int chunkSize = Constants.MAX_SEND_SIZE;
int off = 0;
while (len > 0) {
int thisTime = len;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org