Fixed #1346 - raised default Jetty stop timeout to prevent unbounded …

…thread creation
wiremock · Jul 7, 2020 · 1b48c42 · 1b48c42
1 parent 2b50872
commit 1b48c42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServer.java b/src/main/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServer.java
@@ -163,7 +163,7 @@ private static void setGZippableMethods(HandlerWrapper gzipHandler, Class<?> gzi
 
     protected void finalizeSetup(Options options) {
         if(!options.jettySettings().getStopTimeout().isPresent()) {
-            jettyServer.setStopTimeout(0);
+            jettyServer.setStopTimeout(1000);
         }
     }
 

diff --git a/src/test/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServerTest.java b/src/test/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServerTest.java
@@ -80,7 +80,7 @@ public void testStopTimeout() {
 
     @Test
     public void testStopTimeoutNotSet() {
-        long expectedStopTimeout = 0L;
+        long expectedStopTimeout = 1000L;
         WireMockConfiguration config = WireMockConfiguration.wireMockConfig();
 
         JettyHttpServer jettyHttpServer = (JettyHttpServer) serverFactory.buildHttpServer(config, adminRequestHandler, stubRequestHandler);