Merge branch 'feature/improve-caching-2917'

resolves #2917

application/controllers/StaticController.php

@@ -31,19 +31,22 @@ class StaticController extends Controller
     public function gravatarAction()
     {
         $response = $this->getResponse();
-        $response->setHeader('Pragma', 'cache')
+        $response->setHeader('Cache-Control', 'public, max-age=1814400, stale-while-revalidate=604800', true);
-            ->setHeader('Cache-Control', 'public');
+
+        $noCache = $this->getRequest()->getHeader('Cache-Control') === 'no-cache'
+            || $this->getRequest()->getHeader('Pragma') === 'no-cache';
 
         $cache = FileCache::instance();
         $filename = md5(strtolower(trim($this->getParam('email'))));
         $cacheFile = 'gravatar-' . $filename;
-        if ($etag = $cache->etagMatchesCachedFile($cacheFile)) {
-            $response->setHttpResponseCode(304);
-            return;
-        }
 
-        $response->setHeader('Content-Type', 'image/jpg');
+        if (! $noCache && $cache->has($cacheFile, time() - 1814400)) {
-        if ($cache->has($cacheFile)) {
+            if ($cache->etagMatchesCachedFile($cacheFile)) {
+                $response->setHttpResponseCode(304);
+                return;
+            }
+
+            $response->setHeader('Content-Type', 'image/jpg', true);
             $response->setHeader('ETag', sprintf('"%s"', $cache->etagForCachedFile($cacheFile)));
             $cache->send($cacheFile);
             return;
@@ -83,13 +86,24 @@ class StaticController extends Controller
         }
 
         $s = stat($filePath);
-        $this->getResponse()
+        $eTag = sprintf('%x-%x-%x', $s['ino'], $s['size'], (float) str_pad($s['mtime'], 16, '0'));
-            ->setHeader('Pragma', 'cache')
-            ->setHeader('Content-Type', 'image/' . $extension)
-            ->setHeader('Cache-Control', 'public, max-age=3600')
-            ->setHeader('Last-Modified', gmdate('D, d M Y H:i:s', $s['mtime']) . ' GMT')
-            ->setHeader('ETag', sprintf('%x-%x-%x', $s['ino'], $s['size'], (float) str_pad($s['mtime'], 16, '0')));
 
-        readfile($filePath);
+        $this->getResponse()->setHeader(
+            'Cache-Control',
+            'public, max-age=1814400, stale-while-revalidate=604800',
+            true
+        );
+
+        if ($this->getRequest()->getServer('HTTP_IF_NONE_MATCH') === $eTag) {
+            $this->getResponse()
+                ->setHttpResponseCode(304);
+        } else {
+            $this->getResponse()
+                ->setHeader('ETag', $eTag)
+                ->setHeader('Content-Type', 'image/' . $extension, true)
+                ->setHeader('Last-Modified', gmdate('D, d M Y H:i:s', $s['mtime']) . ' GMT');
+
+            readfile($filePath);
+        }
     }
 }

library/Icinga/Web/FileCache.php

@@ -99,7 +99,7 @@ class FileCache
             return true;
         }
 
-        $info = stat($file);
+        $info = stat($filename);
 
         if ($info === false) {
             return false;
@@ -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;
     }

library/Icinga/Web/JavaScript.php

@@ -98,13 +98,13 @@ class JavaScript
         $request = Icinga::app()->getRequest();
         $noCache = $request->getHeader('Cache-Control') === 'no-cache' || $request->getHeader('Pragma') === 'no-cache';
 
+        header('Cache-Control: public');
         if (! $noCache && FileCache::etagMatchesFiles($files)) {
             header("HTTP/1.1 304 Not Modified");
             return;
         } else {
             $etag = FileCache::etagForFiles($files);
         }
-        header('Cache-Control: public');
         header('ETag: "' . $etag . '"');
         header('Content-Type: application/javascript');
 

library/Icinga/Web/StyleSheet.php

@@ -182,6 +182,7 @@ class StyleSheet
 
         $request = $styleSheet->app->getRequest();
         $response = $styleSheet->app->getResponse();
+        $response->setHeader('Cache-Control', 'public', true);
 
         $noCache = $request->getHeader('Cache-Control') === 'no-cache' || $request->getHeader('Pragma') === 'no-cache';
 
@@ -194,9 +195,7 @@ class StyleSheet
 
         $etag = FileCache::etagForFiles($styleSheet->lessCompiler->getLessFiles());
 
-        $response
+        $response->setHeader('ETag', $etag, true)
-            ->setHeader('Cache-Control', 'public', true)
-            ->setHeader('ETag', $etag, true)
             ->setHeader('Content-Type', 'text/css', true);
 
         $cacheFile = 'icinga-' . $etag . ($minified ? '.min' : '') . '.css';