diff options
author | Brett Profitt <brett.profitt@gmail.com> | 2011-08-25 10:00:38 -0700 |
---|---|---|
committer | Brett Profitt <brett.profitt@gmail.com> | 2011-08-25 10:00:38 -0700 |
commit | dccc333c765bb28da55b4a55d9c916acdb88413a (patch) | |
tree | bdd26a0b4cd85241a19b7fcb2c0770f0ac3eb9f0 /htaccess_dist | |
parent | ec7b94a64aef23b85866ecdac8e8acc712d29bb6 (diff) | |
parent | 003cb81c7888f4d2fd763e5814027c6f8d71186f (diff) | |
download | elgg-dccc333c765bb28da55b4a55d9c916acdb88413a.tar.gz elgg-dccc333c765bb28da55b4a55d9c916acdb88413a.tar.bz2 |
Merge branch 'master' of github.com:brettp/Elgg
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 |