diff options
| author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-03-09 12:26:37 +0000 |
|---|---|---|
| committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-03-09 12:26:37 +0000 |
| commit | 14ecf7f9ab253fbd5c4d1e02b78cf3287b2921ab (patch) | |
| tree | ce1035ea2a0df64f647c87ac22c8a334f6814560 | |
| parent | 9cdcbae0105b914cd96fdde878696676b95cfd7b (diff) | |
| download | elgg-14ecf7f9ab253fbd5c4d1e02b78cf3287b2921ab.tar.gz elgg-14ecf7f9ab253fbd5c4d1e02b78cf3287b2921ab.tar.bz2 | |
Closes #823: Root cause was that the Headers decl requires mod_headers to be installed (and Apache had a very unhelpful failure mode for instances when it wasn't). The Header def has now been IfModuled out.
mod_headers is still recommended for correct functioning across proxies.
git-svn-id: https://code.elgg.org/elgg/trunk@3140 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | htaccess_dist | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/htaccess_dist b/htaccess_dist index 1c876ee12..6f6794d77 100644 --- a/htaccess_dist +++ b/htaccess_dist @@ -74,26 +74,25 @@ DirectoryIndex index.php ## Apache2 deflate support if available
##
-## Important note: This is commented out by default as the Header definition (required for correct functioning
-## through proxy servers) causes an internal server error on some versions of Apache2. Other installations work fine,
-## your mileage may vary.
+## Important note: mod_headers is required for correct functioning across proxies.
##
-## Further details here: http://trac.elgg.org/elgg/ticket/823
-##
-#<IfModule mod_deflate.c>
-# AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript
-# BrowserMatch ^Mozilla/4 gzip-only-text/html
-# BrowserMatch ^Mozilla/4\.[0678] no-gzip
-# BrowserMatch \bMSIE !no-gzip
-# Header append Vary User-Agent env=!dont-vary
+<IfModule mod_deflate.c>
+ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript
+ BrowserMatch ^Mozilla/4 gzip-only-text/html
+ BrowserMatch ^Mozilla/4\.[0678] no-gzip
+ BrowserMatch \bMSIE !no-gzip
+
+<IfModule mod_headers.c>
+ Header append Vary User-Agent env=!dont-vary
+</IfModule>
+
+ # The following is to disable compression for actions. The reason being is that these
+ # may offer direct downloads which (since the initial request comes in as text/html and headers
+ # get changed in the script) get double compressed and become unusable when downloaded by IE.
+ SetEnvIfNoCase Request_URI action\/* no-gzip dont-vary
+ SetEnvIfNoCase Request_URI actions\/* no-gzip dont-vary
-# # The following is to disable compression for actions. The reason being is that these
-# # may offer direct downloads which (since the initial request comes in as text/html and headers
-# # get changed in the script) get double compressed and become unusable when downloaded by IE.
-# SetEnvIfNoCase Request_URI action\/* no-gzip dont-vary
-# SetEnvIfNoCase Request_URI actions\/* no-gzip dont-vary
-#
-#</IfModule>
+</IfModule>
# Configure ETags
<FilesMatch "\.(jpg|jpeg|gif|png|mp3|flv|mov|avi|3pg|html|htm|swf)$">
|