aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-21 17:31:09 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-21 17:31:09 -0700
commitf59edbb48f8d8cb5ebc484252bd6cf08f0f95c62 (patch)
tree003f8418a427944a147a93a30180db2e8ebe4809
parent68534fd5dc6fdc879b075c32849d6cbc8a5fc905 (diff)
parent1c9a222697d7816227032f23e28e39348b697241 (diff)
downloadvolse-hubzilla-f59edbb48f8d8cb5ebc484252bd6cf08f0f95c62.tar.gz
volse-hubzilla-f59edbb48f8d8cb5ebc484252bd6cf08f0f95c62.tar.bz2
volse-hubzilla-f59edbb48f8d8cb5ebc484252bd6cf08f0f95c62.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
-rw-r--r--.htaccess5
-rw-r--r--util/.htaccess4
-rw-r--r--view/.htaccess4
3 files changed, 6 insertions, 7 deletions
diff --git a/.htaccess b/.htaccess
index e9c4de14d..7f3935117 100644
--- a/.htaccess
+++ b/.htaccess
@@ -5,10 +5,10 @@ AddType audio/ogg .oga
# don't allow any web access to logfiles, even after rotation/compression
<FilesMatch "\.(out|log|gz)$">
- <IfModule !mod_access_compat.c>
+ <IfModule mod_authz_core.c>
Require all denied
</IfModule>
- <IfModule mod_access_compat.c>
+ <IfModule !mod_authz_core.c>
Order deny,allow
Deny from all
</IfModule>
@@ -20,7 +20,6 @@ AddType audio/ogg .oga
RewriteRule "(^|/)\.git" - [F]
RewriteRule "(^|/)store" - [F]
-
# Rewrite current-style URLs of the form 'index.php?q=x'.
# Also place auth information into REMOTE_USER for sites running
# in CGI mode.
diff --git a/util/.htaccess b/util/.htaccess
index 333a08d40..a0a0d72d9 100644
--- a/util/.htaccess
+++ b/util/.htaccess
@@ -1,10 +1,10 @@
Options -Indexes
# Remove the following lines or modify it to run the string translator utility
-<IfModule !mod_access_compat.c>
+<IfModule mod_authz_core.c>
Require all denied
</IfModule>
-<IfModule mod_access_compat.c>
+<IfModule !mod_authz_core.c>
Order deny,allow
Deny from all
</IfModule>
diff --git a/view/.htaccess b/view/.htaccess
index 115be49c0..7aa6c4506 100644
--- a/view/.htaccess
+++ b/view/.htaccess
@@ -1,8 +1,8 @@
<FilesMatch "\.tpl">
- <IfModule !mod_access_compat.c>
+ <IfModule mod_authz_core.c>
Require all denied
</IfModule>
- <IfModule mod_access_compat.c>
+ <IfModule !mod_authz_core.c>
Order deny,allow
Deny from all
</IfModule>