Merge branch '3.5.x' into 4.0.x

Closes gh-49314
This commit is contained in:
Andy Wilkinson
2026-02-24 16:26:50 +00:00
@@ -102,16 +102,7 @@ class JettyServletWebServerFactoryTests extends AbstractServletWebServerFactoryT
@Override
protected JettyServletWebServerFactory getFactory() {
JettyServletWebServerFactory factory = new JettyServletWebServerFactory(0);
factory.addServerCustomizers((server) -> {
for (Connector connector : server.getConnectors()) {
if (connector instanceof ServerConnector serverConnector) {
// TODO Set the shutdown idle timeout in main code?
serverConnector.setShutdownIdleTimeout(10000);
}
}
});
return factory;
return new JettyServletWebServerFactory(0);
}
@Override