Merge branch '4.1.x'

Author: spencergibb

spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/cache/ResponseCacheManager.java

@@ -81,7 +81,7 @@ public ResponseCacheManager(CacheKeyGenerator cacheKeyGenerator, Cache cache, Du
 		this.ignoreNoCacheUpdate = isSkipNoCacheUpdateActive(requestOptions);
 		this.afterCacheExchangeMutators = List.of(new SetResponseHeadersAfterCacheExchangeMutator(),
 				new SetStatusCodeAfterCacheExchangeMutator(),
-				new RemoveHeadersAfterCacheExchangeMutator(HttpHeaders.PRAGMA),
+				new RemoveHeadersAfterCacheExchangeMutator(HttpHeaders.PRAGMA, HttpHeaders.EXPIRES),
 				new SetMaxAgeHeaderAfterCacheExchangeMutator(configuredTimeToLive, Clock.systemDefaultZone(),
 						ignoreNoCacheUpdate),
 				new SetCacheDirectivesByMaxAgeAfterCacheExchangeMutator());

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/cache/LocalResponseCacheGatewayFilterFactoryTests.java

@@ -353,21 +353,30 @@ void shouldNotCacheWhenAuthorizationHeaderIsDifferent() {
 
 		@Test
 		void shouldNotReturnPragmaHeaderInNonCachedAndCachedResponses() {
+			shouldNotReturnHeader(HttpHeaders.PRAGMA);
+		}
+
+		@Test
+		void shouldNotReturnExpiresHeaderInNonCachedAndCachedResponses() {
+			shouldNotReturnHeader(HttpHeaders.EXPIRES);
+		}
+
+		private void shouldNotReturnHeader(String header) {
 			String uri = "/" + UUID.randomUUID() + "/cache/headers";
 
 			testClient.get()
 				.uri(uri)
 				.header("Host", "www.localresponsecache.org")
 				.exchange()
 				.expectHeader()
-				.doesNotExist(HttpHeaders.PRAGMA);
+				.doesNotExist(header);
 
 			testClient.get()
 				.uri(uri)
 				.header("Host", "www.localresponsecache.org")
 				.exchange()
 				.expectHeader()
-				.doesNotExist(HttpHeaders.PRAGMA);
+				.doesNotExist(header);
 		}
 
 		void assertNonVaryHeaderInContent(String uri, String varyHeader, String varyHeaderValue, String nonVaryHeader,

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/cache/LocalResponseCacheGlobalFilterTests.java

@@ -126,21 +126,30 @@ void shouldGlobalCacheResponseWhenRouteDoesNotHaveFilter() {
 
 		@Test
 		void shouldNotReturnPragmaHeaderInNonCachedAndCachedResponses() {
+			shouldNotReturnHeader(HttpHeaders.PRAGMA);
+		}
+
+		@Test
+		void shouldNotReturnExpiresHeaderInNonCachedAndCachedResponses() {
+			shouldNotReturnHeader(HttpHeaders.EXPIRES);
+		}
+
+		private void shouldNotReturnHeader(String header) {
 			String uri = "/" + UUID.randomUUID() + "/global-cache/headers";
 
 			testClient.get()
 				.uri(uri)
 				.header("Host", "www.localresponsecache.org")
 				.exchange()
 				.expectHeader()
-				.doesNotExist(HttpHeaders.PRAGMA);
+				.doesNotExist(header);
 
 			testClient.get()
 				.uri(uri)
 				.header("Host", "www.localresponsecache.org")
 				.exchange()
 				.expectHeader()
-				.doesNotExist(HttpHeaders.PRAGMA);
+				.doesNotExist(header);
 		}
 
 		@EnableAutoConfiguration