diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-08-23 09:16:20 -0700 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-08-23 09:16:20 -0700 |
| commit | 3e1a96cabb228b59021676772daca23b22a026c7 (patch) | |
| tree | 3ba1cdf9a9d271c39bceac8b8d5c2b78e0d61977 /htaccess_dist | |
| parent | 8dc4ca48d1ff5c3800637a463a7b072fb253634e (diff) | |
| parent | 5ac7727c36392633dc7d1d4a79ee3c5086bd37b6 (diff) | |
| download | elgg-3e1a96cabb228b59021676772daca23b22a026c7.tar.gz elgg-3e1a96cabb228b59021676772daca23b22a026c7.tar.bz2 | |
Merge branch 'master' of github.com:Elgg/Elgg
Conflicts:
engine/lib/views.php
Diffstat (limited to 'htaccess_dist')
| -rw-r--r-- | htaccess_dist | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/htaccess_dist b/htaccess_dist index 3acdd2a32..bf163c69e 100644 --- a/htaccess_dist +++ b/htaccess_dist @@ -76,10 +76,13 @@ DirectoryIndex index.php </IfModule> # Configure ETags -<FilesMatch "\.(jpg|jpeg|gif|png|mp3|flv|mov|avi|3pg|html|htm|swf)$"> +<FilesMatch "\.(jpg|jpeg|gif|png|mp3|flv|mov|avi|3pg|html|htm|swf|js|ico)$"> FileETag MTime Size </FilesMatch> +# Add Proper MIME-Type for Favicon to allow expires to work +AddType image/vnd.microsoft.icon .ico + <IfModule mod_rewrite.c> RewriteEngine on |