root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2018-02-14 17:22:52 +00:00
parent c587549a68 145d8d2673
commit a1ba2de06b
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatWebServer.java
View File

@ -27,6 +27,7 @@ import javax.naming.NamingException;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Service;
@ -92,8 +93,15 @@ public class TomcatWebServer implements WebServer {
try {
addInstanceIdToEngineName();
// Remove service connectors so that protocol binding doesn't happen yet
removeServiceConnectors();
Context context = findContext();
context.addLifecycleListener((event) -> {
if (context.equals(event.getSource())
&& Lifecycle.START_EVENT.equals(event.getType())) {
// Remove service connectors so that protocol binding doesn't
// happen when the service is started.
removeServiceConnectors();
}
});
// Start the server to trigger initialization listeners
this.tomcat.start();
@ -101,7 +109,6 @@ public class TomcatWebServer implements WebServer {
// We can re-throw failure exception directly in the main thread
rethrowDeferredStartupExceptions();
Context context = findContext();
try {
ContextBindings.bindClassLoader(context, context.getNamingToken(),
getClass().getClassLoader());

15
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java
View File

@ -801,6 +801,21 @@ public abstract class AbstractServletWebServerFactoryTests {
assertThat(sessionCookieConfig.getMaxAge()).isEqualTo(60);
}
@Test
public void sslSessionTracking() {
AbstractServletWebServerFactory factory = getFactory();
Ssl ssl = new Ssl();
ssl.setEnabled(true);
ssl.setKeyStore("src/test/resources/test.jks");
ssl.setKeyPassword("password");
factory.setSsl(ssl);
factory.getSession().setTrackingModes(EnumSet.of(SessionTrackingMode.SSL));
AtomicReference<ServletContext> contextReference = new AtomicReference<>();
this.webServer = factory.getWebServer(contextReference::set);
assertThat(contextReference.get().getEffectiveSessionTrackingModes())
.isEqualTo(EnumSet.of(javax.servlet.SessionTrackingMode.SSL));
}
@Test
public void compressionOfResponseToGetRequest() throws Exception {
assertThat(doTestCompression(10000, null, null)).isTrue();