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

Merge branch '5.2.x'

This commit is contained in:
Sam Brannen 2020-06-17 14:01:36 +02:00
parent 77dd05853c 972c01cbbd
commit 9984a335ca
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/CrossOriginAnnotationIntegrationTests.java
View File

@ -76,7 +76,7 @@ class CrossOriginAnnotationIntegrationTests extends AbstractRequestMappingIntegr
@Override @Override
protected RestTemplate initRestTemplate() { protected RestTemplate initRestTemplate() {
// JDK default HTTP client blacklist headers like Origin // JDK default HTTP client disallowed headers like Origin
return new RestTemplate(new HttpComponentsClientHttpRequestFactory()); return new RestTemplate(new HttpComponentsClientHttpRequestFactory());
} }

2
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/GlobalCorsConfigIntegrationTests.java
View File

@ -64,7 +64,7 @@ class GlobalCorsConfigIntegrationTests extends AbstractRequestMappingIntegration
@Override @Override
protected RestTemplate initRestTemplate() { protected RestTemplate initRestTemplate() {
// JDK default HTTP client blacklists headers like Origin // JDK default HTTP client disallowed headers like Origin
return new RestTemplate(new HttpComponentsClientHttpRequestFactory()); return new RestTemplate(new HttpComponentsClientHttpRequestFactory());
} }