summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2012-02-18 11:39:56 +0100
committerFlorian Pritz <bluewind@xinu.at>2012-02-18 11:39:56 +0100
commitf0ca06e49d6f916c1b0e6d49de3a6d8200d01d6e (patch)
tree3286cc76797f16cd7e95600050cdfd1266ecb13f
parentcbb6617a3866b96556c790ec13260058706b95be (diff)
check for apache modules in htaccess files
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--data/.htaccess5
-rw-r--r--htaccess.txt10
2 files changed, 10 insertions, 5 deletions
diff --git a/data/.htaccess b/data/.htaccess
index c8dfb58fd..bba3837a4 100644
--- a/data/.htaccess
+++ b/data/.htaccess
@@ -4,6 +4,9 @@
ExpiresByType application/javascript "access plus 1 year"
</IfModule>
-Header append Cache-Control "public"
+<IfModule mod_headers.c>
+ Header append Cache-Control "public"
+</IfModule>
+
FileEtag none
diff --git a/htaccess.txt b/htaccess.txt
index 60d053b77..f68be60a8 100644
--- a/htaccess.txt
+++ b/htaccess.txt
@@ -1,4 +1,6 @@
-RewriteEngine on
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^(.*)$ /index.php/?$1 [L]
+<IfModule mod_rewrite.c>
+ RewriteEngine on
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteCond %{REQUEST_FILENAME} !-d
+ RewriteRule ^(.*)$ /index.php/?$1 [L]
+</IfModule>