Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cache Control disabled for 304

Browse Source 
Fixes: gh-5534
This commit is contained in:
Rob Winch
2018-07-17 22:13:33 -05:00
parent f0f678d61e
commit d468d7e6da
4 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/src/main/java/org/springframework/security/web/header/writers/CacheControlHeadersWriter.java
View File

@@ -22,6 +22,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.http.HttpStatus;
import org.springframework.security.web.header.Header;
import org.springframework.security.web.header.HeaderWriter;
import org.springframework.util.ReflectionUtils;
@@ -59,7 +60,7 @@ public final class CacheControlHeadersWriter implements HeaderWriter {
@Override
public void writeHeaders(HttpServletRequest request, HttpServletResponse response) {
if (hasHeader(response, CACHE_CONTROL) || hasHeader(response, EXPIRES)
|| hasHeader(response, PRAGMA)) {
|| hasHeader(response, PRAGMA) || response.getStatus() == HttpStatus.NOT_MODIFIED.value()) {
return;
}
this.delegate.writeHeaders(request, response);

4
web/src/main/java/org/springframework/security/web/server/header/CacheControlServerHttpHeadersWriter.java
View File

@@ -16,6 +16,7 @@
package org.springframework.security.web.server.header;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono;
@@ -61,6 +62,9 @@ public class CacheControlServerHttpHeadersWriter implements ServerHttpHeadersWri
@Override
public Mono<Void> writeHttpHeaders(ServerWebExchange exchange) {
if (exchange.getResponse().getStatusCode() == HttpStatus.NOT_MODIFIED) {
return Mono.empty();
}
return CACHE_HEADERS.writeHttpHeaders(exchange);
}