diff options
author | Sem <sembrestels@riseup.net> | 2014-01-22 03:37:52 +0100 |
---|---|---|
committer | Sem <sembrestels@riseup.net> | 2014-01-22 03:37:52 +0100 |
commit | 4a2ed114bb18c5363f594a380676c5654f4165a4 (patch) | |
tree | 3a37094b249c40e3e6bf122691db53115f65f8f0 /htaccess_dist | |
parent | 673932bc46a3918293a28c2c2fc622b3e5ff6bde (diff) | |
parent | 0dd36c458d41e77521c36ae572fe73114ad4bc5a (diff) | |
download | elgg-4a2ed114bb18c5363f594a380676c5654f4165a4.tar.gz elgg-4a2ed114bb18c5363f594a380676c5654f4165a4.tar.bz2 |
Merge tag '1.8.18' of git://github.com/Elgg/Elgg into develop
1.8.18
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 | 46 |
1 files changed, 33 insertions, 13 deletions
diff --git a/htaccess_dist b/htaccess_dist index 4c888e70a..44d129475 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> @@ -100,6 +112,14 @@ RewriteEngine on # #RewriteBase / + +# If your users receive the message "Sorry, logging in from a different domain is not permitted" +# you must make sure your login form is served from the same hostname as your site pages. +# See http://docs.elgg.org/wiki/Login_token_mismatch_error for more info. +# +# If you must add RewriteRules to change hostname, add them directly below (above all the others) + + # In for backwards compatibility RewriteRule ^pg\/([A-Za-z0-9\_\-]+)$ engine/handlers/page_handler.php?handler=$1&%{QUERY_STRING} [L] RewriteRule ^pg\/([A-Za-z0-9\_\-]+)\/(.*)$ engine/handlers/page_handler.php?handler=$1&page=$2&%{QUERY_STRING} [L] |