This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch tomee-9.x in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 31df2f6742f5ae45a69ca1ac4ddea81b4ca554a0 Author: Richard Zowalla <[email protected]> AuthorDate: Wed Apr 19 20:42:23 2023 +0200 Ports the changes from https://github.com/apache/tomcat/commit/c88552bb1beab14a62842f8aa6a36f5b2d92d29e to Tomcat 10.0.27 regarding the default max parameter count --- boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml | 4 ++-- boms/tomee-plume/src/main/resources/tomee/conf/server.xml | 4 ++-- boms/tomee-plus/src/main/resources/tomee/conf/server.xml | 4 ++-- boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml | 4 ++-- .../src/main/java/org/apache/tomee/installer/Installer.java | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml b/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml index 8038e3327b..7792cbb63f 100644 --- a/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml +++ b/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml @@ -69,7 +69,7 @@ --> <Connector port="8080" protocol="HTTP/1.1" connectionTimeout="20000" - redirectPort="8443" xpoweredBy="false" server="Apache TomEE" /> + redirectPort="8443" maxParameterCount="1000" xpoweredBy="false" server="Apache TomEE" /> <!-- A "Connector" using the shared thread pool--> <!-- <Connector executor="tomcatThreadPool" @@ -86,7 +86,7 @@ --> <!-- <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol" - maxThreads="150" SSLEnabled="true" xpoweredBy="false" server="Apache TomEE" > + maxThreads="150" SSLEnabled="true" maxParameterCount="1000" xpoweredBy="false" server="Apache TomEE" > <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" /> <SSLHostConfig> <Certificate certificateKeystoreFile="conf/localhost-rsa.jks" diff --git a/boms/tomee-plume/src/main/resources/tomee/conf/server.xml b/boms/tomee-plume/src/main/resources/tomee/conf/server.xml index 8038e3327b..7792cbb63f 100644 --- a/boms/tomee-plume/src/main/resources/tomee/conf/server.xml +++ b/boms/tomee-plume/src/main/resources/tomee/conf/server.xml @@ -69,7 +69,7 @@ --> <Connector port="8080" protocol="HTTP/1.1" connectionTimeout="20000" - redirectPort="8443" xpoweredBy="false" server="Apache TomEE" /> + redirectPort="8443" maxParameterCount="1000" xpoweredBy="false" server="Apache TomEE" /> <!-- A "Connector" using the shared thread pool--> <!-- <Connector executor="tomcatThreadPool" @@ -86,7 +86,7 @@ --> <!-- <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol" - maxThreads="150" SSLEnabled="true" xpoweredBy="false" server="Apache TomEE" > + maxThreads="150" SSLEnabled="true" maxParameterCount="1000" xpoweredBy="false" server="Apache TomEE" > <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" /> <SSLHostConfig> <Certificate certificateKeystoreFile="conf/localhost-rsa.jks" diff --git a/boms/tomee-plus/src/main/resources/tomee/conf/server.xml b/boms/tomee-plus/src/main/resources/tomee/conf/server.xml index 8038e3327b..7792cbb63f 100644 --- a/boms/tomee-plus/src/main/resources/tomee/conf/server.xml +++ b/boms/tomee-plus/src/main/resources/tomee/conf/server.xml @@ -69,7 +69,7 @@ --> <Connector port="8080" protocol="HTTP/1.1" connectionTimeout="20000" - redirectPort="8443" xpoweredBy="false" server="Apache TomEE" /> + redirectPort="8443" maxParameterCount="1000" xpoweredBy="false" server="Apache TomEE" /> <!-- A "Connector" using the shared thread pool--> <!-- <Connector executor="tomcatThreadPool" @@ -86,7 +86,7 @@ --> <!-- <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol" - maxThreads="150" SSLEnabled="true" xpoweredBy="false" server="Apache TomEE" > + maxThreads="150" SSLEnabled="true" maxParameterCount="1000" xpoweredBy="false" server="Apache TomEE" > <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" /> <SSLHostConfig> <Certificate certificateKeystoreFile="conf/localhost-rsa.jks" diff --git a/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml b/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml index 8038e3327b..7792cbb63f 100644 --- a/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml +++ b/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml @@ -69,7 +69,7 @@ --> <Connector port="8080" protocol="HTTP/1.1" connectionTimeout="20000" - redirectPort="8443" xpoweredBy="false" server="Apache TomEE" /> + redirectPort="8443" maxParameterCount="1000" xpoweredBy="false" server="Apache TomEE" /> <!-- A "Connector" using the shared thread pool--> <!-- <Connector executor="tomcatThreadPool" @@ -86,7 +86,7 @@ --> <!-- <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol" - maxThreads="150" SSLEnabled="true" xpoweredBy="false" server="Apache TomEE" > + maxThreads="150" SSLEnabled="true" maxParameterCount="1000" xpoweredBy="false" server="Apache TomEE" > <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" /> <SSLHostConfig> <Certificate certificateKeystoreFile="conf/localhost-rsa.jks" diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java index 9b975f9a87..6fbdacf5a4 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java @@ -555,13 +555,13 @@ public class Installer implements InstallerInterface { "<Connector port=\"8080\"", "<Connector port=\"8080\"", "/>", - "xpoweredBy=\"false\" server=\"Apache TomEE\" />"); + " maxParameterCount=\"1000\" xpoweredBy=\"false\" server=\"Apache TomEE\" />"); newServerXml = Installers.replace(newServerXml, "<Connector port=\"8443\"", "<Connector port=\"8443\"", ">", - " xpoweredBy=\"false\" server=\"Apache TomEE\" >"); + " maxParameterCount=\"1000\" xpoweredBy=\"false\" server=\"Apache TomEE\" >"); } catch (final IOException e) { alerts.addError("Error adding server attribute to server.xml file", e); }
