Skip to content

Commit

Permalink
Fixed #1346 - raised default Jetty stop timeout to prevent unbounded …
Browse files Browse the repository at this point in the history
…thread creation
  • Loading branch information
tomakehurst committed Jul 7, 2020
1 parent 2b50872 commit 1b48c42
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 1b48c42

Please sign in to comment.