diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-08-22 22:06:02 -0700 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-08-22 22:06:02 -0700 |
| commit | 2b7817baafb400aab1de20ffb8093429cbe0ceab (patch) | |
| tree | 66dfb08b7884bded8876f47e468b9d87c229a395 /htaccess_dist | |
| parent | 1c07e6bf47c7891324c0a9db8c408f2c00ab6837 (diff) | |
| parent | 21017bfa5016ac33bb115dece9c465990086e813 (diff) | |
| download | elgg-2b7817baafb400aab1de20ffb8093429cbe0ceab.tar.gz elgg-2b7817baafb400aab1de20ffb8093429cbe0ceab.tar.bz2 | |
Merge pull request #62 from tvld/master
Fixes #3601: Missing .js and .ico in Etag in .htaccess
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 |