Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ apacheDirectoryVersion=2.1.7
apacheMinaVersion=2.2.4

# Usually matches the version specified as a Spring Boot dependency (see springBootVersion below)
apacheTomcatVersion=10.1.42
apacheTomcatVersion=10.1.41

# (mothership) -> json-path -> json-smart -> accessor-smart
# (core) -> graalvm
Expand Down
5 changes: 0 additions & 5 deletions server/configs/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,6 @@ context.encryptionKey=@@encryptionKey@@
#context.bypass2FA=true
#context.workDirLocation=/path/to/desired/workDir

## Tomcat v10.1.42 lowered the default for part count from 1000 to 10. Our default is now 500, but can be overridden here.
## Header size default changed from 10Kb to 512, which is also our default.
#context.maxConnectorPartCount=500
#context.maxConnectorPartHeaderSize=512

## SMTP configuration
mail.smtpHost=@@smtpHost@@
mail.smtpPort=@@smtpPort@@
Expand Down
5 changes: 0 additions & 5 deletions server/configs/webapps/embedded/config/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,6 @@ mail.smtpUser=Anonymous
#context.bypass2FA=true
#context.workDirLocation=@@/path/to/desired/workDir@@

## Tomcat v10.1.42 lowered the default for part count from 1000 to 10. Our default is now 500, but can be overridden here.
## Header size default changed from 10Kb to 512, which is also our default.
#context.maxConnectorPartCount=500
#context.maxConnectorPartHeaderSize=512

## Other webapps to be deployed, most commonly to deliver a set of static files. The context path to deploy into is the
## property name after the "context.additionalWebapps." prefix, and the value is the location of the webapp on disk
#context.additionalWebapps.firstContextPath=@@/my/webapp/path@@
Expand Down
32 changes: 0 additions & 32 deletions server/embedded/src/org/labkey/embedded/LabKeyServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -148,14 +148,6 @@ public WebServerFactoryCustomizer<TomcatServletWebServerFactory> customizer()
return customizer -> customizer.setDisableMBeanRegistry(false);
}

@Bean
TomcatConnectorCustomizer connectorCustomizer() {
return (connector) -> {
connector.setMaxPartCount(contextSource().getMaxConnectorPartCount());
connector.setMaxPartHeaderSize(contextSource().getMaxConnectorPartHeaderSize());
};
}

@Bean
public TomcatServletWebServerFactory servletContainerFactory()
{
Expand All @@ -168,7 +160,6 @@ public TomcatServletWebServerFactory servletContainerFactory()
Connector httpConnector = new Connector();
httpConnector.setScheme("http");
httpConnector.setPort(contextProperties.getHttpPort());
result.getTomcatConnectorCustomizers().forEach(customizer -> customizer.customize(httpConnector));
result.addAdditionalTomcatConnectors(httpConnector);
}

Expand Down Expand Up @@ -466,9 +457,6 @@ public static class ContextProperties
private Map<String, Map<String, Map<String, String>>> resources;
private Map<String, String> additionalWebapps;

private Integer maxConnectorPartCount = 500;
private Integer maxConnectorPartHeaderSize = 512;

public List<String> getDataSourceName()
{
return dataSourceName;
Expand Down Expand Up @@ -731,26 +719,6 @@ public void setAdditionalWebapps(Map<String, String> additionalWebapps)
{
this.additionalWebapps = additionalWebapps;
}

public Integer getMaxConnectorPartCount()
{
return maxConnectorPartCount;
}

public void setMaxConnectorPartCount(Integer maxConnectorPartCount)
{
this.maxConnectorPartCount = maxConnectorPartCount;
}

public Integer getMaxConnectorPartHeaderSize()
{
return maxConnectorPartHeaderSize;
}

public void setMaxConnectorPartHeaderSize(Integer maxConnectorPartHeaderSize)
{
this.maxConnectorPartHeaderSize = maxConnectorPartHeaderSize;
}
}

@Configuration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public LabKeyTomcatServletWebServerFactory(LabKeyServer server)

addConnectorCustomizers(connector -> {
LabKeyServer.TomcatProperties props = _server.tomcatProperties();
_server.connectorCustomizer().customize(connector);

if (props.getUseBodyEncodingForURI() != null)
{
Expand Down