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/11 19:28:59 UTC
svn commit: r485793 - in /tomcat/connectors/trunk/jk/java/org/apache/jk:
common/ChannelSocket.java common/JkInputStream.java core/JkHandler.java
core/MsgContext.java
Author: pero
Date: Mon Dec 11 10:28:58 2006
New Revision: 485793
URL: http://svn.apache.org/viewvc?view=rev&rev=485793
Log:
Add a packetSize option to match the option.
Backport from Tomcat 6.0.x
Modified:
tomcat/connectors/trunk/jk/java/org/apache/jk/common/ChannelSocket.java
tomcat/connectors/trunk/jk/java/org/apache/jk/common/JkInputStream.java
tomcat/connectors/trunk/jk/java/org/apache/jk/core/JkHandler.java
tomcat/connectors/trunk/jk/java/org/apache/jk/core/MsgContext.java
Modified: tomcat/connectors/trunk/jk/java/org/apache/jk/common/ChannelSocket.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/jk/common/ChannelSocket.java?view=diff&rev=485793&r1=485792&r2=485793
==============================================================================
--- tomcat/connectors/trunk/jk/java/org/apache/jk/common/ChannelSocket.java (original)
+++ tomcat/connectors/trunk/jk/java/org/apache/jk/common/ChannelSocket.java Mon Dec 11 10:28:58 2006
@@ -655,7 +655,7 @@
log.debug("Accepting ajp connections on " + port);
while( running ) {
try{
- MsgContext ep=createMsgContext();
+ MsgContext ep=createMsgContext(packetSize);
ep.setSource(this);
ep.setWorkerEnv( wEnv );
this.accept(ep);
Modified: tomcat/connectors/trunk/jk/java/org/apache/jk/common/JkInputStream.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/jk/common/JkInputStream.java?view=diff&rev=485793&r1=485792&r2=485793
==============================================================================
--- tomcat/connectors/trunk/jk/java/org/apache/jk/common/JkInputStream.java (original)
+++ tomcat/connectors/trunk/jk/java/org/apache/jk/common/JkInputStream.java Mon Dec 11 10:28:58 2006
@@ -39,8 +39,8 @@
private static org.apache.commons.logging.Log log=
org.apache.commons.logging.LogFactory.getLog( JkInputStream.class );
- private Msg bodyMsg = new MsgAjp();
- private Msg outputMsg = new MsgAjp();
+ private Msg bodyMsg ;
+ private Msg outputMsg ;
private MsgContext mc;
@@ -61,11 +61,20 @@
// ignore
}
}
-
- public JkInputStream(MsgContext context) {
+
+ public JkInputStream(MsgContext context, int bsize) {
mc = context;
+ bodyMsg = new MsgAjp(bsize);
+ outputMsg = new MsgAjp(bsize);
}
+ /**
+ * @deprecated
+ */
+ public JkInputStream(MsgContext context) {
+ this(context, 8*1024);
+ }
+
// -------------------- Jk specific methods --------------------
Modified: tomcat/connectors/trunk/jk/java/org/apache/jk/core/JkHandler.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/jk/core/JkHandler.java?view=diff&rev=485793&r1=485792&r2=485793
==============================================================================
--- tomcat/connectors/trunk/jk/java/org/apache/jk/core/JkHandler.java (original)
+++ tomcat/connectors/trunk/jk/java/org/apache/jk/core/JkHandler.java Mon Dec 11 10:28:58 2006
@@ -110,10 +110,14 @@
public void destroy() throws IOException {
}
- public MsgContext createMsgContext() {
- return new MsgContext();
- }
-
+ public MsgContext createMsgContext() {
+ return new MsgContext(8*1024);
+ }
+
+ public MsgContext createMsgContext(int bsize) {
+ return new MsgContext(bsize);
+ }
+
public int invoke(Msg msg, MsgContext mc ) throws IOException {
return OK;
}
Modified: tomcat/connectors/trunk/jk/java/org/apache/jk/core/MsgContext.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/jk/core/MsgContext.java?view=diff&rev=485793&r1=485792&r2=485793
==============================================================================
--- tomcat/connectors/trunk/jk/java/org/apache/jk/core/MsgContext.java (original)
+++ tomcat/connectors/trunk/jk/java/org/apache/jk/core/MsgContext.java Mon Dec 11 10:28:58 2006
@@ -53,7 +53,7 @@
private Object notes[]=new Object[32];
private JkHandler next;
private JkChannel source;
- private JkInputStream jkIS = new JkInputStream(this);
+ private JkInputStream jkIS;
private C2BConverter c2b;
private Request req;
private WorkerEnv wEnv;
@@ -80,12 +80,20 @@
public static final int JK_STATUS_CLOSED=2;
public static final int JK_STATUS_ERROR=3;
- public MsgContext() {
+ public MsgContext(int bsize) {
try {
c2b = new C2BConverter("iso-8859-1");
} catch(IOException iex) {
log.warn("Can't happen", iex);
}
+ jkIS = new JkInputStream(this, bsize);
+ }
+
+ /**
+ * @deprecated
+ */
+ public MsgContext() {
+ this(8*1024);
}
public final Object getNote( int id ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org