]> source.dussan.org Git - nextcloud-server.git/commitdiff
Fix setting ETag header on cache miss
authorBart Visscher <bartv@thisnet.nl>
Mon, 25 Jun 2012 15:46:03 +0000 (17:46 +0200)
committerBart Visscher <bartv@thisnet.nl>
Mon, 25 Jun 2012 19:05:10 +0000 (21:05 +0200)
lib/minimizer.php

index 2650c579c1ddbaa56660aaa6664475f50e4d7e0b..3bf5ff9980b8457dc72a8cebc5f5b5742e4f001a 100644 (file)
@@ -25,12 +25,15 @@ abstract class OC_Minimizer {
                $cache = OC_Cache::getGlobalCache();
                if (!OC_Request::isNoCache() && (!defined('DEBUG') || !DEBUG)){
                        $gzout = $cache->get($cache_key.'.gz');
-                       OC_Response::setETagHeader(md5($gzout));
+                       if ($gzout) {
+                               OC_Response::setETagHeader(md5($gzout));
+                       }
                }
 
                if (!$gzout) {
                        $out = $this->minimizeFiles($files);
                        $gzout = gzencode($out);
+                       OC_Response::setETagHeader(md5($gzout));
                        $cache->set($cache_key.'.gz', $gzout);
                }
                if ($encoding = OC_Request::acceptGZip()) {