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

horde · Jan 13, 2016 · 85be54e · 85be54e
1 parent baa08d5
commit 85be54e
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 4 deletions.
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 @@
 v3.0.6-git
 ----------
 
+[jan] Use access rules compatible with both Apache 2.2 and 2.4.
 [jan] Fix updating tickets with owners via the API (Neal Thomas Oakey
       <oakey@b1-systems.de>).
 [mjr] Fix incorrect casting of numeric strings to integers (Bug #14146).

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
@@ -27,6 +27,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/bsdl.php">BSD-2-Clause</license>
  <notes>
+* [jan] Use access rules compatible with both Apache 2.2 and 2.4.
 * [jan] Fix updating tickets with owners via the API (Neal Thomas Oakey &lt;oakey@b1-systems.de&gt;).
 * [mjr] Fix incorrect casting of numeric strings to integers (Bug #14146).
 * [mjr] Allow due date to be changed via the API (Neal Thomas Oakey &lt;oakey@b1-systems.de&gt;).
@@ -1195,6 +1196,7 @@
    <date>2015-10-20</date>
    <license uri="http://www.horde.org/licenses/bsdl.php">BSD-2-Clause</license>
    <notes>
+* [jan] Use access rules compatible with both Apache 2.2 and 2.4.
 * [jan] Fix updating tickets with owners via the API (Neal Thomas Oakey &lt;oakey@b1-systems.de&gt;).
 * [mjr] Fix incorrect casting of numeric strings to integers (Bug #14146).
 * [mjr] Allow due date to be changed via the API (Neal Thomas Oakey &lt;oakey@b1-systems.de&gt;).

diff --git a/templates/.htaccess b/templates/.htaccess
@@ -1 +1,6 @@
-Deny from all
+<IfModule authz_core_module>
+    Require all denied
+</IfModule>
+<IfModule !authz_core_module>
+    Deny from all
+</IfModule>