diff options
| author | thomascube <thomas@roundcube.net> | 2009-06-19 14:42:09 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2009-06-19 14:42:09 +0000 |
| commit | 2f14293716edb59882eb6f16e1ad4b7fb79ce3da (patch) | |
| tree | db7701f65840a1d5063e5be67a0bba77af51405d | |
| parent | fb1e3b7b875081338ec233340a9527b506cba4ec (diff) | |
Use filemtime for cache busting + better etag for static files
| -rw-r--r-- | .htaccess | 2 | ||||
| -rw-r--r-- | program/include/rcube_html_page.php | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -43,7 +43,7 @@ ExpiresActive On ExpiresDefault "access plus 1 month" </IfModule> -FileETag MTime +FileETag MTime Size Order deny,allow Allow from all diff --git a/program/include/rcube_html_page.php b/program/include/rcube_html_page.php index d56b5ce3f..446efa5b8 100644 --- a/program/include/rcube_html_page.php +++ b/program/include/rcube_html_page.php @@ -55,7 +55,7 @@ class rcube_html_page static $sa_files = array(); if (!preg_match('|^https?://|i', $file) && $file[0] != '/') - $file = $this->scripts_path . $file . (($fs = @filesize($this->scripts_path . $file)) ? '?s='.$fs : ''); + $file = $this->scripts_path . $file . (($fs = @filemtime($this->scripts_path . $file)) ? '?s='.$fs : ''); if (in_array($file, $sa_files)) { return; @@ -250,7 +250,7 @@ class rcube_html_page // correct absolute paths in images and other tags $output = preg_replace('!(src|href|background)=(["\']?)(/[a-z0-9_-]+)!i', "\\1=\\2$base_path\\3", $output); - $output = preg_replace_callback('!(src|href)=(["\']?)([a-z0-9/_.-]+.(css|js))(["\'\s>])!i', array($this, 'add_filesize'), $output); + $output = preg_replace_callback('!(src|href)=(["\']?)([a-z0-9/_.-]+.(css|js))(["\'\s>])!i', array($this, 'add_filemtime'), $output); $output = str_replace('$__skin_path', $base_path, $output); echo rcube_charset_convert($output, 'UTF-8', $this->charset); @@ -259,9 +259,9 @@ class rcube_html_page /** * Callback function for preg_replace_callback in write() */ - public function add_filesize($matches) + public function add_filemtime($matches) { - return sprintf("%s=%s%s?s=%d%s", $matches[1], $matches[2], $matches[3], @filesize($matches[3]), $matches[5]); + return sprintf("%s=%s%s?s=%d%s", $matches[1], $matches[2], $matches[3], @filemtime($matches[3]), $matches[5]); } } |