[jan] Use access rules compatible with both Apache 2.2 and 2.4.

horde · Jan 13, 2016 · 2ba9a19 · 2ba9a19
1 parent d9d5805
commit 2ba9a19
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 4 deletions.
diff --git a/bin/.htaccess b/bin/.htaccess
@@ -1 +1,6 @@
-Deny from all
+<IfModule authz_core_module>
+    Require all denied
+</IfModule>
+<IfModule !authz_core_module>
+    Deny from all
+</IfModule>
diff --git a/config/.htaccess b/config/.htaccess
@@ -1 +1,6 @@
-Deny from all
+<IfModule authz_core_module>
+    Require all denied
+</IfModule>
+<IfModule !authz_core_module>
+    Deny from all
+</IfModule>
diff --git a/docs/CHANGES b/docs/CHANGES
@@ -2,6 +2,7 @@
 v4.2.7-git
 ----------
 
+[jan] Use access rules compatible with both Apache 2.2 and 2.4.
 [mjr] Fix possible fatal error due to tasks created with an alarm but no due
       date (Bug #14214).
 [mjr] Fix storage of parent field when using Kolab driver (Bug #14197,

diff --git a/lib/.htaccess b/lib/.htaccess
@@ -1 +1,6 @@
-Deny from all
+<IfModule authz_core_module>
+    Require all denied
+</IfModule>
+<IfModule !authz_core_module>
+    Deny from all
+</IfModule>
diff --git a/locale/.htaccess b/locale/.htaccess
@@ -1 +1,6 @@
-Deny from all
+<IfModule authz_core_module>
+    Require all denied
+</IfModule>
+<IfModule !authz_core_module>
+    Deny from all
+</IfModule>
diff --git a/package.xml b/package.xml
@@ -33,6 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
+* [jan] Use access rules compatible with both Apache 2.2 and 2.4.
 * [mjr] Fix possible fatal error due to tasks created with an alarm but no due date (Bug #14214).
 * [mjr] Fix storage of parent field when using Kolab driver (Bug #14197, mike.gabriel@das-netzwerkteam.de).
 * [mjr] Fix switching tab/filters when using Kolab driver (Bug #14196, mike.gabriel@das-netzwerkteam.de).
@@ -1678,6 +1679,7 @@
    <date>2015-10-20</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [jan] Use access rules compatible with both Apache 2.2 and 2.4.
 * [mjr] Fix possible fatal error due to tasks created with an alarm but no due date (Bug #14214).
 * [mjr] Fix storage of parent field when using Kolab driver (Bug #14197, mike.gabriel@das-netzwerkteam.de).
 * [mjr] Fix switching tab/filters when using Kolab driver (Bug #14196, mike.gabriel@das-netzwerkteam.de).