Fix the ETag handling

WoltLab · May 18, 2024 · 3ad1b81 · 3ad1b81
1 parent 075d05e
commit 3ad1b81
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/wcfsetup/install/files/lib/action/FileDownloadAction.class.php b/wcfsetup/install/files/lib/action/FileDownloadAction.class.php
@@ -108,11 +108,19 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         );
 
         $httpIfNoneMatch = \array_map(
-            static fn ($tag) => \preg_replace('^"W/', '"', $tag),
-            Header::splitList($request->getHeaderLine('HTTP_IF_NONE_MATCH'))
+            static fn ($tag) => \preg_replace('~^"W/~', '"', $tag),
+            Header::splitList($request->getHeaderLine('if-none-match'))
         );
         if (\in_array($nonWeakETag, $httpIfNoneMatch, true)) {
-            return new EmptyResponse(304);
+            $emptyResponse = new EmptyResponse(304);
+            if ($response->getHeader('expires')) {
+                $emptyResponse = $emptyResponse->withHeader('expires', $response->getHeader('expires'));
+            }
+            if ($response->getHeader('cache-control')) {
+                $emptyResponse = $emptyResponse->withHeader('cache-control', $response->getHeader('cache-control'));
+            }
+
+            return $emptyResponse;
         }
 
         return $response