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 2017-01-20 15:54:04 +00:00
parent d5a4058862 0ad4e0e70f
commit eb4329fb39
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-dependencies/pom.xml
View File

@ -181,7 +181,7 @@
<thymeleaf-layout-dialect.version>1.4.0</thymeleaf-layout-dialect.version> <thymeleaf-layout-dialect.version>1.4.0</thymeleaf-layout-dialect.version>
<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version> <thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
<thymeleaf-extras-java8time.version>2.1.0.RELEASE</thymeleaf-extras-java8time.version> <thymeleaf-extras-java8time.version>2.1.0.RELEASE</thymeleaf-extras-java8time.version>
<tomcat.version>8.5.6</tomcat.version> <tomcat.version>8.5.11</tomcat.version>
<undertow.version>1.4.8.Final</undertow.version> <undertow.version>1.4.8.Final</undertow.version>
<unboundid-ldapsdk.version>3.2.0</unboundid-ldapsdk.version> <unboundid-ldapsdk.version>3.2.0</unboundid-ldapsdk.version>
<webjars-hal-browser.version>9f96c74</webjars-hal-browser.version> <webjars-hal-browser.version>9f96c74</webjars-hal-browser.version>

18
spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -247,14 +247,18 @@ public class TomcatEmbeddedServletContainerFactoryTests
TomcatEmbeddedServletContainerFactory factory = getFactory(); TomcatEmbeddedServletContainerFactory factory = getFactory();
factory.setUriEncoding(Charset.forName("US-ASCII")); factory.setUriEncoding(Charset.forName("US-ASCII"));
Tomcat tomcat = getTomcat(factory); Tomcat tomcat = getTomcat(factory);
assertThat(tomcat.getConnector().getURIEncoding()).isEqualTo("US-ASCII"); Connector connector = ((TomcatEmbeddedServletContainer) this.container)
.getServiceConnectors().get(tomcat.getService())[0];
assertThat(connector.getURIEncoding()).isEqualTo("US-ASCII");
} }
@Test @Test
public void defaultUriEncoding() throws Exception { public void defaultUriEncoding() throws Exception {
TomcatEmbeddedServletContainerFactory factory = getFactory(); TomcatEmbeddedServletContainerFactory factory = getFactory();
Tomcat tomcat = getTomcat(factory); Tomcat tomcat = getTomcat(factory);
assertThat(tomcat.getConnector().getURIEncoding()).isEqualTo("UTF-8"); Connector connector = ((TomcatEmbeddedServletContainer) this.container)
.getServiceConnectors().get(tomcat.getService())[0];
assertThat(connector.getURIEncoding()).isEqualTo("UTF-8");
} }
@Test @Test
@ -263,13 +267,12 @@ public class TomcatEmbeddedServletContainerFactoryTests
ssl.setKeyStore("test.jks"); ssl.setKeyStore("test.jks");
ssl.setKeyStorePassword("secret"); ssl.setKeyStorePassword("secret");
ssl.setCiphers(new String[] { "ALPHA", "BRAVO", "CHARLIE" }); ssl.setCiphers(new String[] { "ALPHA", "BRAVO", "CHARLIE" });
TomcatEmbeddedServletContainerFactory factory = getFactory(); TomcatEmbeddedServletContainerFactory factory = getFactory();
factory.setSsl(ssl); factory.setSsl(ssl);
Tomcat tomcat = getTomcat(factory); Tomcat tomcat = getTomcat(factory);
Connector connector = tomcat.getConnector(); Connector connector = ((TomcatEmbeddedServletContainer) this.container)
.getServiceConnectors().get(tomcat.getService())[0];
SSLHostConfig[] sslHostConfigs = connector.getProtocolHandler() SSLHostConfig[] sslHostConfigs = connector.getProtocolHandler()
.findSslHostConfigs(); .findSslHostConfigs();
assertThat(sslHostConfigs[0].getCiphers()).isEqualTo("ALPHA:BRAVO:CHARLIE"); assertThat(sslHostConfigs[0].getCiphers()).isEqualTo("ALPHA:BRAVO:CHARLIE");
@ -309,9 +312,8 @@ public class TomcatEmbeddedServletContainerFactoryTests
this.container = factory this.container = factory
.getEmbeddedServletContainer(sessionServletRegistration()); .getEmbeddedServletContainer(sessionServletRegistration());
Tomcat tomcat = ((TomcatEmbeddedServletContainer) this.container).getTomcat(); Tomcat tomcat = ((TomcatEmbeddedServletContainer) this.container).getTomcat();
Connector connector = tomcat.getConnector();
this.container.start(); this.container.start();
Connector connector = tomcat.getConnector();
SSLHostConfig sslHostConfig = connector.getProtocolHandler() SSLHostConfig sslHostConfig = connector.getProtocolHandler()
.findSslHostConfigs()[0]; .findSslHostConfigs()[0];
assertThat(sslHostConfig.getSslProtocol()).isEqualTo("TLS"); assertThat(sslHostConfig.getSslProtocol()).isEqualTo("TLS");