Changeset 555

Timestamp:

Dec 15, 2015 10:29:47 PM (8 years ago)

Author:

anonymous

Message:

Further improvements to JS and CSS caching

Location:

trunk/lib

Files:

• CSS.inc.php (modified) (1 diff)
• JS.inc.php (modified) (1 diff)

trunk/lib/CSS.inc.php

@@ -145 +145 @@
         }
 
+        header('Content-Type: text/css; charset=' . $this->getParam('character_set'));
+        header(sprintf('Last-Modified: %s GMT', gmdate('D, d M Y H:i:s', $latest_mtime), null));
         if ($this->getParam('cache_enable')) {
-            header(sprintf('Last-Modified: %s GMT', gmdate('D, d M Y H:i:s', $latest_mtime), null));
             header(sprintf('Cache-Control: public, max-age=%s', $this->getParam('cache_seconds')));
+            header(sprintf('Expires: %s GMT', gmdate('D, d M Y H:i:s', $latest_mtime + $this->getParam('cache_seconds'))));
             header('Pragma: public');
+            header('Vary: Accept-Encoding');
         } else {
+            header('Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0');
             header('Expires: -1');
             header('Pragma: no-cache');
-            header('Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0');
         }
-        header('Content-Type: text/css; charset=' . $this->getParam('character_set'));
     }
 

trunk/lib/JS.inc.php

@@ -145 +145 @@
         }
 
+        header('Content-Type: application/javascript; charset=' . $this->getParam('character_set'));
+        header(sprintf('Last-Modified: %s GMT', gmdate('D, d M Y H:i:s', $latest_mtime), null));
         if ($this->getParam('cache_enable')) {
-            header(sprintf('Last-Modified: %s GMT', gmdate('D, d M Y H:i:s', $latest_mtime), null));
             header(sprintf('Cache-Control: private, max-age=%s', $this->getParam('cache_seconds')));
+            header(sprintf('Expires: %s GMT', gmdate('D, d M Y H:i:s', $latest_mtime + $this->getParam('cache_seconds'))));
             header('Pragma: private');
+            header('Vary: Accept-Encoding');
         } else {
+            header('Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0');
             header('Expires: -1');
             header('Pragma: no-cache');
-            header('Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0');
         }
-        header('Content-Type: application/javascript; charset=' . $this->getParam('character_set'));
+
     }