FileCache: Ignore compression suffix when checking cache made of multiple files

refs #2917
2017-08-22 09:31:56 +02:00 · 2017-08-22 09:31:56 +02:00 · 6702ccb2a7
parent 7b7bfb5a5d
commit 6702ccb2a7
1 changed files with 5 additions and 0 deletions
--- a/library/Icinga/Web/FileCache.php
+++ b/library/Icinga/Web/FileCache.php
@ -201,6 +201,11 @@ class FileCache
            return false;
        }

+        if (preg_match('/([0-9a-f]{8}-[0-9a-f]{8}-[0-9a-f]{8})-\w+/i', $match, $matches)) {
+            // Removes compression suffixes as our custom algorithm can't handle compressed cache files anyway
+            $match = $matches[1];
+        }
+
        $etag = self::etagForFiles($files);
        return $match === $etag ? $etag : false;
    }