diff options
| author | Sem <sembrestels@riseup.net> | 2013-03-13 02:13:17 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2013-03-13 02:13:17 +0100 |
| commit | d730a0c5861c2e79faa3e58dd2b171ca4d197c6f (patch) | |
| tree | cb4658e1c60a60c5f663845d49b108dd4608a89a /htaccess_dist | |
| parent | 0fb3e5396d10d21323eb3bbc04727fd4a5a6d06d (diff) | |
| parent | 34b14b305f5a106316fdc403c4ce80b25e89b51d (diff) | |
| download | elgg-d730a0c5861c2e79faa3e58dd2b171ca4d197c6f.tar.gz elgg-d730a0c5861c2e79faa3e58dd2b171ca4d197c6f.tar.bz2 | |
Merge tag '1.8.14' of git://github.com/Elgg/Elgg into foxglove-3
Elgg 1.8.14
Conflicts:
mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
Diffstat (limited to 'htaccess_dist')
| -rw-r--r-- | htaccess_dist | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/htaccess_dist b/htaccess_dist index 4c888e70a..898fa22fb 100644 --- a/htaccess_dist +++ b/htaccess_dist @@ -1,14 +1,11 @@ # Elgg htaccess directives -# Copyright Curverider Ltd 2008-2009 -# License http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 -# Link http://elgg.org/ <Files "htaccess_dist"> order allow,deny deny from all </Files> -# Don't listing directory +# Don't allow listing directories Options -Indexes # Follow symbolic links @@ -17,13 +14,28 @@ Options +FollowSymLinks # Default handler DirectoryIndex index.php -# Turn on expiry + +############################ +# BROWSER CACHING + +# The expires module controls the Expires and Cache-Control headers. Elgg sets +# these for dynamically generated files so this is just for static files. <IfModule mod_expires.c> ExpiresActive On - ExpiresDefault "access plus 10 years" + ExpiresDefault "access plus 1 year" </IfModule> -# php 5, apache 1 and 2 +# Conditional requests are controlled through Last-Modified and ETag headers. +# Elgg sets these on dynamically generated cacheable files so this is just for +# static files. Note: Apache sends Last-Modified by default on static files so +# I don't think we need to be sending ETag for these files. +<FilesMatch "\.(jpg|jpeg|gif|png|mp3|flv|mov|avi|3pg|html|htm|swf|js|css|ico)$"> + FileETag MTime Size +</FilesMatch> + + +############################ +# PHP SETTINGS <IfModule mod_php5.c> # limit the maximum memory consumed by the php script to 64 MB php_value memory_limit 64M @@ -37,6 +49,10 @@ DirectoryIndex index.php php_value display_errors 0 </IfModule> + +############################ +# COMPRESSION + # Turn on mod_gzip if available <IfModule mod_gzip.c> mod_gzip_on yes @@ -75,13 +91,9 @@ DirectoryIndex index.php </IfModule> -# Configure ETags -<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 +############################ +# REWRITE RULES <IfModule mod_rewrite.c> |