Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Upgrade Undertow to 2.3.22.Final and reset upload limit size to same as with previous versions. (#2491)

Eric Bariauxa69efa146781
diff --git a/container/src/main/java/org/openremote/container/web/WebService.java b/container/src/main/java/org/openremote/container/web/WebService.java
index c96a2e31b..d359c61f5 100644
--- a/container/src/main/java/org/openremote/container/web/WebService.java
+++ b/container/src/main/java/org/openremote/container/web/WebService.java
@@ -23,6 +23,7 @@ import com.google.common.collect.Lists;
import com.thetransactioncompany.cors.CORSFilter;
import io.undertow.Handlers;
import io.undertow.Undertow;
+import io.undertow.UndertowOptions;
import io.undertow.attribute.ExchangeAttributes;
import io.undertow.predicate.Predicates;
import io.undertow.server.HttpHandler;
@@ -138,6 +139,9 @@ public abstract class WebService implements ContainerService {
.setWorkerThreads(getInteger(container.getConfig(), OR_WEBSERVER_WORKER_THREADS_MAX, OR_WEBSERVER_WORKER_THREADS_MAX_DEFAULT))
.setWorkerOption(Options.WORKER_NAME, "WebService")
.setWorkerOption(Options.THREAD_DAEMON, true)
+ // TODO: setting entity size to unlimited to reset to Undertow 2.3.20.Final behaviour
+ // but should be addressed in a better way: https://github.com/openremote/openremote/issues/2490
+ .setServerOption(UndertowOptions.MAX_ENTITY_SIZE, -1L)
).build();
// We have to set system properties for websocket timeouts
diff --git a/gradle.properties b/gradle.properties
index 427d721cc..ced0d8cf8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,7 @@ javaxELVersion = 4.0.2
slf4jVersion = 2.0.6
guavaVersion = 33.5.0-jre
checkerframeworkVersion = 3.53.0
-undertowVersion = 2.3.18.Final
+undertowVersion = 2.3.22.Final
resteasyVersion = 6.2.11.Final
keycloakVersion = 25.0.3
classgraphVersion=4.8.184