diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-06-19 14:42:09 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-06-19 14:42:09 +0000 |
| commit | 506472ea50ea73cdcc98286b510aa52c6bc2ecc5 (patch) | |
| tree | 1aae7f801e84610c6adbc885f3ea0c8e9b180f94 /roundcubemail | |
| parent | db6df93ddada7e2e4cd21894a3d5e7fad0d50772 (diff) | |
Use filemtime for cache busting + better etag for static files
git-svn-id: https://svn.roundcube.net/trunk@2654 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
| -rw-r--r-- | roundcubemail/.htaccess | 2 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_html_page.php | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/roundcubemail/.htaccess b/roundcubemail/.htaccess index a30369db8..9b8063d4a 100644 --- a/roundcubemail/.htaccess +++ b/roundcubemail/.htaccess @@ -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/roundcubemail/program/include/rcube_html_page.php b/roundcubemail/program/include/rcube_html_page.php index d56b5ce3f..446efa5b8 100644 --- a/roundcubemail/program/include/rcube_html_page.php +++ b/roundcubemail/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]); } } |