diff --git a/core-bundle/src/EventListener/SubrequestCacheSubscriber.php b/core-bundle/src/EventListener/SubrequestCacheSubscriber.php index 3776105e2d2..8651f03bfff 100644 --- a/core-bundle/src/EventListener/SubrequestCacheSubscriber.php +++ b/core-bundle/src/EventListener/SubrequestCacheSubscriber.php @@ -82,6 +82,7 @@ public function onKernelResponse(ResponseEvent $event): void if ($isMasterRequest) { $this->currentStrategy = array_pop($this->strategyStack); + $response->headers->remove(self::MERGE_CACHE_HEADER); } } diff --git a/core-bundle/tests/EventListener/SubrequestCacheSubscriberTest.php b/core-bundle/tests/EventListener/SubrequestCacheSubscriberTest.php index 704dedd1a25..0f784ad4948 100644 --- a/core-bundle/tests/EventListener/SubrequestCacheSubscriberTest.php +++ b/core-bundle/tests/EventListener/SubrequestCacheSubscriberTest.php @@ -57,6 +57,7 @@ public function testMergesCacheControlHeader(): void $this->assertSame(30, $mainResponse->getMaxAge()); $this->assertSame('max-age=30, public', $mainResponse->headers->get('Cache-Control')); + $this->assertFalse($mainResponse->headers->has(SubrequestCacheSubscriber::MERGE_CACHE_HEADER)); } public function testMakeMasterResponsePrivateIfSubrequestIsPrivate(): void @@ -79,6 +80,7 @@ public function testMakeMasterResponsePrivateIfSubrequestIsPrivate(): void $this->onKernelResponse($subscriber, $mainResponse, KernelInterface::MASTER_REQUEST); $this->assertSame('private', $mainResponse->headers->get('Cache-Control')); + $this->assertFalse($mainResponse->headers->has(SubrequestCacheSubscriber::MERGE_CACHE_HEADER)); } public function testIgnoresSubrequestWithoutMergeHeader(): void @@ -100,6 +102,7 @@ public function testIgnoresSubrequestWithoutMergeHeader(): void $this->onKernelResponse($subscriber, $mainResponse, KernelInterface::MASTER_REQUEST); $this->assertSame('max-age=60, public', $mainResponse->headers->get('Cache-Control')); + $this->assertFalse($mainResponse->headers->has(SubrequestCacheSubscriber::MERGE_CACHE_HEADER)); } public function testIgnoresSubrequestWithoutCacheControlHeader(): void @@ -122,6 +125,7 @@ public function testIgnoresSubrequestWithoutCacheControlHeader(): void $this->onKernelResponse($subscriber, $mainResponse, KernelInterface::MASTER_REQUEST); $this->assertSame('max-age=60, public', $mainResponse->headers->get('Cache-Control')); + $this->assertFalse($mainResponse->headers->has(SubrequestCacheSubscriber::MERGE_CACHE_HEADER)); } private function onKernelRequest(SubrequestCacheSubscriber $subscriber, int $requestType): void