aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-22 08:09:00 +1000
committerredmatrix <redmatrix@redmatrix.me>2015-06-22 08:09:00 +1000
commit9f9dee28ca6cb86a7c58fa8fd28c086498e83e21 (patch)
treefc7d6243c56f10b257515772442f10ba8600ad36
parentc1e0987b880c116b392d65a2b40cda2fd53debe0 (diff)
parent5a96f3331a86b32f6ed1c44fb44f43a287611a38 (diff)
downloadvolse-hubzilla-9f9dee28ca6cb86a7c58fa8fd28c086498e83e21.tar.gz
volse-hubzilla-9f9dee28ca6cb86a7c58fa8fd28c086498e83e21.tar.bz2
volse-hubzilla-9f9dee28ca6cb86a7c58fa8fd28c086498e83e21.zip
Merge pull request #353 from dawnbreak/master
Compatible update for .htaccess.
-rw-r--r--.htaccess10
-rw-r--r--util/.htaccess11
-rw-r--r--view/.htaccess10
3 files changed, 23 insertions, 8 deletions
diff --git a/.htaccess b/.htaccess
index 39fd89e04..e9c4de14d 100644
--- a/.htaccess
+++ b/.htaccess
@@ -5,7 +5,13 @@ AddType audio/ogg .oga
# don't allow any web access to logfiles, even after rotation/compression
<FilesMatch "\.(out|log|gz)$">
-Deny from all
+ <IfModule !mod_access_compat.c>
+ Require all denied
+ </IfModule>
+ <IfModule mod_access_compat.c>
+ Order deny,allow
+ Deny from all
+ </IfModule>
</FilesMatch>
<IfModule mod_rewrite.c>
@@ -22,6 +28,4 @@ Deny from all
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)$ index.php?q=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
-
</IfModule>
-
diff --git a/util/.htaccess b/util/.htaccess
index b311c14c2..333a08d40 100644
--- a/util/.htaccess
+++ b/util/.htaccess
@@ -1,5 +1,10 @@
Options -Indexes
-# Remove the following line or modify it to run the string translator utility
-Deny from all
-
+# Remove the following lines or modify it to run the string translator utility
+<IfModule !mod_access_compat.c>
+ Require all denied
+</IfModule>
+<IfModule mod_access_compat.c>
+ Order deny,allow
+ Deny from all
+</IfModule>
diff --git a/view/.htaccess b/view/.htaccess
index 559a5fcc0..115be49c0 100644
--- a/view/.htaccess
+++ b/view/.htaccess
@@ -1,3 +1,9 @@
<FilesMatch "\.tpl">
-Deny from all
-</FilesMatch> \ No newline at end of file
+ <IfModule !mod_access_compat.c>
+ Require all denied
+ </IfModule>
+ <IfModule mod_access_compat.c>
+ Order deny,allow
+ Deny from all
+ </IfModule>
+</FilesMatch>