Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure CORS processing does not add Vary header twice on async requests #24223

Closed
wants to merge 1 commit into from
Closed

Ensure CORS processing does not add Vary header twice on async requests #24223

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java
View file
Open in desktop
Expand Up @@ -36,6 +36,7 @@
import org.springframework.http.server.ServletServerHttpResponse;
import org.springframework.lang.Nullable;
import org.springframework.util.CollectionUtils;
import org.springframework.web.context.request.async.WebAsyncUtils;

/**
* The default implementation of {@link CorsProcessor}, as defined by the
Expand All @@ -60,6 +61,10 @@ public class DefaultCorsProcessor implements CorsProcessor {
public boolean processRequest(@Nullable CorsConfiguration config, HttpServletRequest request,
HttpServletResponse response) throws IOException {

if (WebAsyncUtils.getAsyncManager(request).hasConcurrentResult()) {
return true;
}

response.addHeader(HttpHeaders.VARY, HttpHeaders.ORIGIN);
response.addHeader(HttpHeaders.VARY, HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD);
response.addHeader(HttpHeaders.VARY, HttpHeaders.ACCESS_CONTROL_REQUEST_HEADERS);
Expand Down