You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2009/04/06 22:57:46 UTC
svn commit: r762504 - in /tomcat/tc6.0.x/trunk: STATUS.txt
java/org/apache/jk/common/ChannelNioSocket.java
java/org/apache/jk/common/ChannelSocket.java
java/org/apache/jk/common/MsgAjp.java
Author: rjung
Date: Mon Apr 6 20:57:46 2009
New Revision: 762504
URL: http://svn.apache.org/viewvc?rev=762504&view=rev
Log:
Backport r757706: Use some already existing constants
instead of explicit numbers in the AJP connectors.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/MsgAjp.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=762504&r1=762503&r2=762504&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Apr 6 20:57:46 2009
@@ -80,12 +80,6 @@
+1: markt, rjung
-1:
-* Use some already existing constants instead of explicit
- numbers in the AJP connectors. Backport of
- http://svn.apache.org/viewvc?rev=757706&view=rev
- +1: rjung, markt, billbarker
- -1:
-
* Allow huge request body packets for AJP13.
Part 2 of the backport proposed and approved above
(r697192), now also for the other AJP connectors.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java?rev=762504&r1=762503&r2=762504&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java Mon Apr 6 20:57:46 2009
@@ -100,8 +100,8 @@
private int socketTimeout = 0;
private boolean nioIsBroken = false;
private Selector selector = null;
- private int bufferSize = 8*1024;
- private int packetSize = 8*1024;
+ private int bufferSize = AjpConstants.MAX_PACKET_SIZE;
+ private int packetSize = AjpConstants.MAX_PACKET_SIZE;
private long requestCount=0;
@@ -154,7 +154,7 @@
}
public void setBufferSize(int bs) {
- if(bs > 8*1024) {
+ if(bs > AjpConstants.MAX_PACKET_SIZE) {
bufferSize = bs;
}
}
@@ -164,8 +164,8 @@
}
public void setPacketSize(int ps) {
- if(ps < 8*1024) {
- ps = 8*1024;
+ if(ps < AjpConstants.MAX_PACKET_SIZE) {
+ ps = AjpConstants.MAX_PACKET_SIZE;
}
packetSize = ps;
}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java?rev=762504&r1=762503&r2=762504&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java Mon Apr 6 20:57:46 2009
@@ -89,7 +89,7 @@
private int linger=100;
private int socketTimeout;
private int bufferSize = -1;
- private int packetSize = 8*1024;
+ private int packetSize = AjpConstants.MAX_PACKET_SIZE;
private long requestCount=0;
@@ -208,8 +208,8 @@
}
public void setPacketSize(int ps) {
- if(ps < 8*1024) {
- ps = 8*1024;
+ if(ps < AjpConstants.MAX_PACKET_SIZE) {
+ ps = AjpConstants.MAX_PACKET_SIZE;
}
packetSize = ps;
}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/MsgAjp.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/common/MsgAjp.java?rev=762504&r1=762503&r2=762504&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/common/MsgAjp.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/common/MsgAjp.java Mon Apr 6 20:57:46 2009
@@ -63,8 +63,8 @@
* Constructor that takes a buffer size
*/
public MsgAjp(int bsize) {
- if(bsize < 8*1024) {
- bsize = 8*1024;
+ if(bsize < AjpConstants.MAX_PACKET_SIZE) {
+ bsize = AjpConstants.MAX_PACKET_SIZE;
}
bufsize = bsize;
buf = new byte[bsize];
@@ -76,7 +76,7 @@
* @deprecated Use the buffer size constructor.
*/
public MsgAjp() {
- this(8*1024);
+ this(AjpConstants.MAX_PACKET_SIZE);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org