You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2012/01/17 07:13:21 UTC
svn commit: r1232316 - in /geronimo/server/branches/2.2: ./
plugins/console/console-base-portlets/src/main/i18n-resources/
plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/
plugins/tomcat/geronimo-tomcat6/src/main/java/org/apach...
Author: xiaming
Date: Tue Jan 17 06:13:21 2012
New Revision: 1232316
URL: http://svn.apache.org/viewvc?rev=1232316&view=rev
Log:
GERONIMO-6250 Add maxParameterCount to gbean attribute for easy configuaration from admin console, patch provided by Yi Xiao
Modified:
geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties
geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_ja.properties
geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_zh.properties
geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/CommonProtocol.java
geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java
geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/resources/org/apache/geronimo/tomcat/messages.properties
geronimo/server/branches/2.2/pom.xml
Modified: geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties?rev=1232316&r1=1232315&r2=1232316&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties (original)
+++ geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties Tue Jan 17 06:13:21 2012
@@ -546,6 +546,8 @@ webmanager.common.maxHttpHeaderSize
webmanager.common.maxHttpHeaderSizeExp = The maximum size of the request and response HTTP header, specified in bytes. If not specified, this attribute is set to 4096 (4 KB).
webmanager.common.maxKeepAliveRequests = MaxKeepAliveRequests
webmanager.common.maxKeepAliveRequestsExp = The maximum number of HTTP requests which can be pipelined until the connection is closed by the server. Setting this attribute to 1 will disable HTTP/1.0 keep-alive, as well as HTTP/1.1 keep-alive and pipelining. Setting this to -1 will allow an unlimited amount of pipelined or keep-alive HTTP requests. If not specified, this attribute is set to 100.
+webmanager.common.MaxParameterCount = MaxParameterCount
+webmanager.common.MaxParameterCountExp = The maximum number of parameters (GET plus POST) which will be automatically parsed by the container. 10000 by default. A value of less than 0 means no limit.
webmanager.common.maxPostSize = MaxPostSize
webmanager.common.maxPostSizeExp = The maximum size in bytes of the POST which will be handled by the container FORM URL parameter parsing. The limit can be disabled by setting this attribute to a value less than or equal to 0. Default value is 2097152 (2 megabytes)
webmanager.common.maxSavePostSize = MaxSavePostSize
Modified: geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_ja.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_ja.properties?rev=1232316&r1=1232315&r2=1232316&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_ja.properties (original)
+++ geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_ja.properties Tue Jan 17 06:13:21 2012
@@ -552,6 +552,8 @@ webmanager.common.maxHttpHeaderSize
webmanager.common.maxHttpHeaderSizeExp = The maximum size of the request and response HTTP header, specified in bytes. If not specified, this attribute is set to 4096 (4 KB).
webmanager.common.maxKeepAliveRequests = MaxKeepAliveRequests
webmanager.common.maxKeepAliveRequestsExp = The maximum number of HTTP requests which can be pipelined until the connection is closed by the server. Setting this attribute to 1 will disable HTTP/1.0 keep-alive, as well as HTTP/1.1 keep-alive and pipelining. Setting this to -1 will allow an unlimited amount of pipelined or keep-alive HTTP requests. If not specified, this attribute is set to 100.
+webmanager.common.MaxParameterCount = MaxParameterCount
+webmanager.common.MaxParameterCountExp = The maximum number of parameters (GET plus POST) which will be automatically parsed by the container. 10000 by default. A value of less than 0 means no limit.
webmanager.common.maxPostSize = MaxPostSize
webmanager.common.maxPostSizeExp = The maximum size in bytes of the POST which will be handled by the container FORM URL parameter parsing. The limit can be disabled by setting this attribute to a value less than or equal to 0. Default value is 2097152 (2 megabytes)
webmanager.common.maxSavePostSize = MaxSavePostSize
Modified: geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_zh.properties?rev=1232316&r1=1232315&r2=1232316&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_zh.properties (original)
+++ geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_zh.properties Tue Jan 17 06:13:21 2012
@@ -546,6 +546,8 @@ webmanager.common.maxHttpHeaderSize
webmanager.common.maxHttpHeaderSizeExp = HTTP请æ±åååºå¤´çæ大大å°,åä½ä¸ºåè.å¦ææªæå®,该å±æ§å¼ä¸º4096(4KB).
webmanager.common.maxKeepAliveRequests = æ大ä¿æè¿æ¥è¯·æ±æ°
webmanager.common.maxKeepAliveRequestsExp = å¯ä»¥æ¾å
¥ç®¡éç´å°æå¡å¨å
³éè¿æ¥çHTTP请æ±çæ大æ°é.å±æ§å¼è®¾ä¸º1å°ç¦ç¨HTTP/1.0ä¿æè¿æ¥åHTTP/1.1ä¿æè¿æ¥å管é.å±æ§å¼è®¾ä¸º-1å°ä¸éå¶æ¾å
¥ç®¡éæä¿æè¿æ¥çHTTP请æ±ä¸ªæ°ã.å¦ææªæå®,å±æ§å¼ä¸º100.
+webmanager.common.MaxParameterCount = MaxParameterCount
+webmanager.common.MaxParameterCountExp = The maximum number of parameters (GET plus POST) which will be automatically parsed by the container. 10000 by default. A value of less than 0 means no limit.
webmanager.common.maxPostSize = POSTæ大大å°
webmanager.common.maxPostSizeExp = 容å¨å¨è¡¨åURLåæ°è§£ææ¶å¤ççPOSTçæ大åèæ°.å°å±æ§å¼è®¾ä¸ºå°çäº0çå¼å°è§£é¤éå¶.é»è®¤å¼æ¯2097152(2MB).
webmanager.common.maxSavePostSize = ä¿åPOSTæ大大å°
Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java?rev=1232316&r1=1232315&r2=1232316&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java (original)
+++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java Tue Jan 17 06:13:21 2012
@@ -416,7 +416,8 @@ public class TomcatManagerImpl implement
connectorAttributes.add(new ConnectorAttribute<Boolean>("allowTrace", false, Messages.getString("TomcatManagerImpl.80"), Boolean.class)); //$NON-NLS-1$ //$NON-NLS-2$
connectorAttributes.add(new ConnectorAttribute<Boolean>("emptySessionPath", false, Messages.getString("TomcatManagerImpl.82"), Boolean.class)); //$NON-NLS-1$ //$NON-NLS-2$
connectorAttributes.add(new ConnectorAttribute<Boolean>("enableLookups", true, Messages.getString("TomcatManagerImpl.84"), Boolean.class)); //$NON-NLS-1$ //$NON-NLS-2$
- connectorAttributes.add(new ConnectorAttribute<Integer>("maxPostSize", 2097152, Messages.getString("TomcatManagerImpl.86"), Integer.class)); //$NON-NLS-1$ //$NON-NLS-2$
+ connectorAttributes.add(new ConnectorAttribute<Integer>("maxParameterCount", 10000, Messages.getString("TomcatManagerImpl.85"), Integer.class)); //$NON-NLS-1$ //$NON-NLS-2$
+ connectorAttributes.add(new ConnectorAttribute<Integer>("maxPostSize", 2097152, Messages.getString("TomcatManagerImpl.86"), Integer.class)); //$NON-NLS-1$ //$NON-NLS-2$
connectorAttributes.add(new ConnectorAttribute<Integer>("maxSavePostSize", 4096, Messages.getString("TomcatManagerImpl.88"), Integer.class)); //$NON-NLS-1$ //$NON-NLS-2$
connectorAttributes.add(new ConnectorAttribute<String>("proxyName", null, Messages.getString("TomcatManagerImpl.90"), String.class)); //$NON-NLS-1$ //$NON-NLS-2$
connectorAttributes.add(new ConnectorAttribute<Integer>("proxyPort", 0, Messages.getString("TomcatManagerImpl.92"), Integer.class)); //$NON-NLS-1$ //$NON-NLS-2$
Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/CommonProtocol.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/CommonProtocol.java?rev=1232316&r1=1232315&r2=1232316&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/CommonProtocol.java (original)
+++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/CommonProtocol.java Tue Jan 17 06:13:21 2012
@@ -25,6 +25,8 @@ public interface CommonProtocol {
public void setEmptySessionPath(boolean emptySessionPath);
public boolean getEnableLookups();
public void setEnableLookups(boolean enableLookups);
+ public int getMaxParameterCount();
+ public void setMaxParameterCount(int count);
public int getMaxPostSize();
public void setMaxPostSize(int bytes);
public int getMaxSavePostSize();
Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java?rev=1232316&r1=1232315&r2=1232316&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java (original)
+++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java Tue Jan 17 06:13:21 2012
@@ -233,7 +233,16 @@ public abstract class ConnectorGBean ext
public void setMaxPostSize(int bytes) {
connector.setMaxPostSize(bytes);
}
-
+
+ public int getMaxParameterCount(){
+ int value = connector.getMaxParameterCount();
+ return value == 0 ? 10000 : value;
+ }
+
+ public void setMaxParameterCount(int count){
+ connector.setMaxParameterCount(count);
+ }
+
public String getProtocol() {
//This is totally wrong on the Geronimo side and needs to be re-thought out.
//This was done to shoe horn in gerneric Geronimo protocols which should have no relation
Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/resources/org/apache/geronimo/tomcat/messages.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/resources/org/apache/geronimo/tomcat/messages.properties?rev=1232316&r1=1232315&r2=1232316&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/resources/org/apache/geronimo/tomcat/messages.properties (original)
+++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/resources/org/apache/geronimo/tomcat/messages.properties Tue Jan 17 06:13:21 2012
@@ -48,6 +48,7 @@ TomcatManagerImpl.60=webmanager.connecto
TomcatManagerImpl.80=webmanager.connector.editConnector.TomcatManagerImpl.80
TomcatManagerImpl.82=webmanager.connector.editConnector.TomcatManagerImpl.82
TomcatManagerImpl.84=webmanager.connector.editConnector.TomcatManagerImpl.84
+TomcatManagerImpl.85=webmanager.connector.editConnector.TomcatManagerImpl.85
TomcatManagerImpl.86=webmanager.connector.editConnector.TomcatManagerImpl.86
TomcatManagerImpl.88=webmanager.connector.editConnector.TomcatManagerImpl.88
TomcatManagerImpl.90=webmanager.connector.editConnector.TomcatManagerImpl.90
Modified: geronimo/server/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/pom.xml?rev=1232316&r1=1232315&r2=1232316&view=diff
==============================================================================
--- geronimo/server/branches/2.2/pom.xml (original)
+++ geronimo/server/branches/2.2/pom.xml Tue Jan 17 06:13:21 2012
@@ -62,7 +62,7 @@
FIXME: STOP using properties for dependency versions unless you absolutly need them,
ie. you have a hundred dependencies that all use the same version.
-->
- <tomcatVersion>6.0.33.1</tomcatVersion>
+ <tomcatVersion>6.0.35.1</tomcatVersion>
<tomcatGroupId>org.apache.geronimo.ext.tomcat</tomcatGroupId>
<openejbVersion>3.1.5-SNAPSHOT</openejbVersion>