Skip to content

Commit f6c1681

Browse files
committed
Merge branch '5.1.x'
2 parents bd3d7db + 20f4022 commit f6c1681

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ else if (mediaType.isPresentIn(ALL_APPLICATION_MEDIA_TYPES)) {
284284
if (body != null) {
285285
Object theBody = body;
286286
LogFormatUtils.traceDebug(logger, traceOn ->
287-
"Writing [" + LogFormatUtils.formatValue(theBody, traceOn) + "]");
287+
"Writing [" + LogFormatUtils.formatValue(theBody, !traceOn) + "]");
288288
addContentDispositionHeader(inputMessage, outputMessage);
289289
if (genericConverter != null) {
290290
genericConverter.write(body, targetType, selectedMediaType, outputMessage);

src/docs/asciidoc/web/webflux-cors.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,11 @@ You can apply CORS support through the built-in
224224
{api-spring-framework}/web/cors/reactive/CorsWebFilter.html[`CorsWebFilter`], which is a
225225
good fit with <<webflux-fn,functional endpoints>>.
226226

227+
NOTE: If you try to use the `CorsFilter` with Spring Security, keep in mind that Spring
228+
Security has
229+
https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#cors[built-in support]
230+
for CORS.
231+
227232
To configure the filter, you can declare a `CorsWebFilter` bean and pass a
228233
`CorsConfigurationSource` to its constructor, as the following example shows:
229234

0 commit comments

Comments
 (0)