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/06 06:27:34 UTC
svn commit: r1227961 - in /geronimo/server/branches/2.1/plugins:
console/console-base-portlets/src/main/resources/
tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/
tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connec...
Author: xiaming
Date: Fri Jan 6 05:27:33 2012
New Revision: 1227961
URL: http://svn.apache.org/viewvc?rev=1227961&view=rev
Log:
GERONIMO-6250 support setting maxParameterCount in GBean
Modified:
geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase_en.properties
geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase_ja.properties
geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties
geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/CommonProtocol.java
geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java
geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/resources/org/apache/geronimo/tomcat/messages.properties
Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase_en.properties?rev=1227961&r1=1227960&r2=1227961&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase_en.properties (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase_en.properties Fri Jan 6 05:27:33 2012
@@ -501,6 +501,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
@@ -653,6 +655,7 @@ webmanager.connector.editConnector.Tomca
webmanager.connector.editConnector.TomcatManagerImpl.80 = A boolean value which can be used to enable or disable the TRACE HTTP method.
webmanager.connector.editConnector.TomcatManagerImpl.82 = If set to true, all paths for session cookies will be set to /. This can be useful for portlet specification implementations, but will greatly affect performance if many applications are accessed on a given server by the client.
webmanager.connector.editConnector.TomcatManagerImpl.84 = Set to true if you want calls to request.getRemoteHost() to perform DNS lookups in order to return the actual host name of the remote client. Set to false to skip the DNS lookup and return the IP address in String form instead (thereby improving performance).
+webmanager.connector.editConnector.TomcatManagerImpl.85 = 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.connector.editConnector.TomcatManagerImpl.86 = 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.
webmanager.connector.editConnector.TomcatManagerImpl.88 = The maximum size in bytes of the POST which will be saved/buffered by the container during FORM or CLIENT-CERT authentication. For both types of authentication, the POST will be saved/buffered before the user is authenticated. For CLIENT-CERT authentication, the POST is buffered for the duration of the SSL handshake and the buffer emptied when the request is processed. For FORM authentication the POST is saved whilst the user is re-directed to the login form and is retained until the user successfully authenticates or the session associated with the authentication request expires. The limit can be disabled by setting this attribute to -1. Setting the attribute to zero will disable the saving of POST data during authentication.
webmanager.connector.editConnector.TomcatManagerImpl.90 = If this Connector is being used in a proxy configuration, configure this attribute to specify the server name to be returned for calls to request.getServerName().
Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase_ja.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase_ja.properties?rev=1227961&r1=1227960&r2=1227961&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase_ja.properties (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase_ja.properties Fri Jan 6 05:27:33 2012
@@ -500,6 +500,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
@@ -665,6 +667,7 @@ webmanager.connector.editConnector.Tomca
webmanager.connector.editConnector.TomcatManagerImpl.80 = TRACE HTTP \u30e1\u30bd\u30c3\u30c9\u3092\u6709\u52b9\u306b\u3059\u308b\u304b\u7121\u52b9\u306b\u3059\u308b\u304b\u3069\u3046\u304b\u3092\u6307\u5b9a\u3059\u308b\u30d6\u30fc\u30ea\u30a2\u30f3\u5024\u3002
webmanager.connector.editConnector.TomcatManagerImpl.82 = true \u3092\u8a2d\u5b9a\u3059\u308b\u3068\u3001\u30bb\u30c3\u30b7\u30e7\u30f3\u30fb\u30af\u30c3\u30ad\u30fc\u306e\u5168\u3066\u306e\u30d1\u30b9\u306b / \u304c\u8a2d\u5b9a\u3055\u308c\u307e\u3059\u3002\u3053\u308c\u306f\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u5b9f\u88c5\u306b\u6709\u7528\u53ef\u80fd\u3067\u3059\u304c\u3001\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u304b\u3089\u6307\u5b9a\u3055\u308c\u305f\u30b5\u30fc\u30d0\u30fc\u4e0a\u306b\u3042\u308b\u591a\u304f\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3078\u30a2\u30af\u30bb\u30b9\u3055\u308c\u308b\u3068\u3001\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u306b\u5927\u304d\u304f\u5f71\u97ff\u3059\u308b\u3067\u3057\u3087\u3046\u3002
webmanager.connector.editConnector.TomcatManagerImpl.84 = \u30ea\u30e2\u30fc\u30c8\u30fb\u30db\u30b9\u30c8\u306e\u5b9f\u969b\u306e\u30db\u30b9\u30c8\u540d\u3092\u8fd4\u3059\u305f\u3081\u306e DNS \u53c2\u7167\u3092\u5b9f\u884c\u3059\u308b equest.getRemoteHost() \u3092\u547c\u3073\u51fa\u3057\u305f\u3044\u5834\u5408\u306b true \u3092\u8a2d\u5b9a\u3057\u307e\u3059\u3002DNS \u53c2\u7167\u3092\u30b9\u30ad\u30c3\u30d7\u3059\u308b\u306b\u306f false \u3092\u8a2d\u5b9a\u3057\u3001\u305d\u306e\u66ff\u308f\u308a\u306b String \u5f62\u5f0f\u306e IP \u30a2\u30c9\u30ec\u30b9\u3092\u8fd4\u3057\u307e\u3059 (\u3053\u308c\u306b\u3088\u308a\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u3092\u6539\u5584\u3057\u307e\u3059)\u3002
+webmanager.connector.editConnector.TomcatManagerImpl.85 = 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.connector.editConnector.TomcatManagerImpl.86 = \u30b3\u30f3\u30c6\u30ca\u30fc\u306e FORM URL \u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u306e\u89e3\u6790\u306b\u3088\u3063\u3066\u30cf\u30f3\u30c9\u30eb\u3059\u308b POST \u306e\u6700\u5927\u30d0\u30a4\u30c8\u30fb\u30b5\u30a4\u30ba
webmanager.connector.editConnector.TomcatManagerImpl.88 = \u30d5\u30a9\u30fc\u30e0\u307e\u305f\u306f\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u8a3c\u660e\u66f8\u306e\u8a8d\u8a3c\u3067\u30b3\u30f3\u30c6\u30ca\u30fc\u304c\u4fdd\u5b58/\u30d0\u30c3\u30d5\u30a1\u30ea\u30f3\u30b0\u3059\u308b POST \u6700\u5927\u30d0\u30a4\u30c8\u30fb\u30b5\u30a4\u30ba\u3002\u3053\u308c\u3089\u306e\u4e21\u65b9\u306e\u8a8d\u8a3c\u5f62\u5f0f\u3067\u306f\u3001\u30e6\u30fc\u30b6\u30fc\u3092\u8a8d\u8a3c\u3059\u308b\u76f4\u524d\u3067 POST \u5185\u5bb9\u3092\u4fdd\u5b58\u30d0\u30c3\u30d5\u30a1\u30ea\u30f3\u30b0\u3057\u307e\u3059\u3002\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u8a3c\u660e\u66f8\u306e\u8a8d\u8a3c\u3067\u306f\u3001\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u51e6\u7406\u3059\u308b\u3068\u304d\u306b SSL \u30cf\u30f3\u30c9\u30b7\u30a7\u30a4\u30af\u304a\u3088\u3073\u7a7a\u3044\u305f\u30d0\u30c3\u30d5\u30a1\u30fc\u3092\u4fdd\u6301\u3059\u308b\u305f\u3081\u306b POST \u5185\u5bb9\u3092\u30d0\u30c3\u30d5\u30a1\u30ea
\u30f3\u30b0\u3057\u307e\u3059\u3002\u30d5\u30a9\u30fc\u30e0\u8a8d\u8a3c\u3067\u306f\u3001\u30e6\u30fc\u30b6\u30fc\u304c\u30ed\u30b0\u30a4\u30f3\u30fb\u30d5\u30a9\u30fc\u30e0\u3078\u30ea\u30c0\u30a4\u30ec\u30af\u30c8\u3059\u308b\u9593\u306b POST \u5185\u5bb9\u3092\u4fdd\u5b58\u3057\u3001\u30e6\u30fc\u30b6\u30fc\u304c\u6b63\u3057\u304f\u8a8d\u8a3c\u3059\u308b\u304b\u3001\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u8a8d\u8a3c\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u671f\u9650\u3092\u95a2\u9023\u4ed8\u3051\u308b\u307e\u3067\u4fdd\u6301\u3057\u307e\u3059\u3002\u3053\u306e\u5c5e\u6027\u306b -1 \u3092\u8a2d\u5b9a\u3059\u308b\u3068\u3001\u5236\u9650\u3092\u7121\u52b9\u5316\u3067\u304d\u307e\u3059\u3002\u5c5e\u6027\u306b 0 \u3092\u8a2d\u5b9a\u3059\u308b\u3068\u3001\u8a8d\u8a3c\u4e2d\u306b POST \u30c7\u30fc\u30bf\u306e\u4fdd\u5b58\u3092\u7121\u52b9\u5316\u3057\u307e\u3059\u3002
webmanager.connector.editConnector.TomcatManagerImpl.90 = \u3053\u306e\u30b3\u30cd\u30af\u30bf\u30fc\u304c\u30d7\u30ed\u30ad\u30b7\u30fc\u69cb\u6210\u3092\u4f7f\u7528\u3059\u308b\u5834\u5408\u3001\u3053\u306e\u5c5e\u6027\u306b request.getServerName() \u306e\u547c\u3073\u51fa\u3057\u6642\u306b\u8fd4\u3055\u308c\u308b\u30b5\u30fc\u30d0\u30fc\u540d\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties?rev=1227961&r1=1227960&r2=1227961&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties Fri Jan 6 05:27:33 2012
@@ -480,6 +480,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.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java?rev=1227961&r1=1227960&r2=1227961&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java Fri Jan 6 05:27:33 2012
@@ -416,6 +416,7 @@ 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>("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$
Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/CommonProtocol.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/CommonProtocol.java?rev=1227961&r1=1227960&r2=1227961&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/CommonProtocol.java (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/CommonProtocol.java Fri Jan 6 05:27:33 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.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java?rev=1227961&r1=1227960&r2=1227961&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java Fri Jan 6 05:27:33 2012
@@ -157,6 +157,15 @@ 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.
@@ -287,6 +296,7 @@ public abstract class ConnectorGBean ext
"allowTrace",
"emptySessionPath",
"enableLookups",
+ "maxParameterCount",
"maxPostSize",
"maxSavePostSize",
"protocol",
@@ -307,6 +317,7 @@ public abstract class ConnectorGBean ext
"allowTrace",
"emptySessionPath",
"enableLookups",
+ "maxParameterCount",
"maxPostSize",
"maxSavePostSize",
"protocol",
Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/resources/org/apache/geronimo/tomcat/messages.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/resources/org/apache/geronimo/tomcat/messages.properties?rev=1227961&r1=1227960&r2=1227961&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/resources/org/apache/geronimo/tomcat/messages.properties (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/resources/org/apache/geronimo/tomcat/messages.properties Fri Jan 6 05:27:33 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