.htaccess files: support Apache 2.4+ syntax

If `mod_version` is enabled, the previous syntax will apply for Apache <2.4.
If not, the new syntax is used by default.

Fixes #676

`mod_version` identifier is `version_module` across all Apache versions. See:

  * https://httpd.apache.org/docs/current/mod/mod_version.html
  * https://httpd.apache.org/docs/2.2/mod/mod_version.html
  * https://serverfault.com/questions/733910/how-do-i-load-mod-version-only-if-it-isnt-built-in-to-apache

Note that version_module comes built-in with Debian (and derivatives) Apache2 packages, see https://wiki.debian.org/Apache/PackagingFor24

diff --git a/application/.htaccess b/application/.htaccess
index b584d98c56a27ebb09c963313876fd8d1a3e9987..f601c1eeee5ff6e42f4eccdd43f76169fdf0ba0a 100644 (file)
--- a/application/.htaccess
+++ b/application/.htaccess
@@ -1,2 +1,13 @@
-Allow from none
-Deny from all
+<IfModule version_module>
+  <IfVersion >= 2.4>
+     Require all denied
+  </IfVersion>
+  <IfVersion < 2.4>
+     Allow from none
+     Deny from all
+  </IfVersion>
+</IfModule>
+
+<IfModule !version_module>
+    Require all denied
+</IfModule>

diff --git a/cache/.htaccess b/cache/.htaccess
index b584d98c56a27ebb09c963313876fd8d1a3e9987..f601c1eeee5ff6e42f4eccdd43f76169fdf0ba0a 100644 (file)
--- a/cache/.htaccess
+++ b/cache/.htaccess
@@ -1,2 +1,13 @@
-Allow from none
-Deny from all
+<IfModule version_module>
+  <IfVersion >= 2.4>
+     Require all denied
+  </IfVersion>
+  <IfVersion < 2.4>
+     Allow from none
+     Deny from all
+  </IfVersion>
+</IfModule>
+
+<IfModule !version_module>
+    Require all denied
+</IfModule>

diff --git a/data/.htaccess b/data/.htaccess
index b584d98c56a27ebb09c963313876fd8d1a3e9987..f601c1eeee5ff6e42f4eccdd43f76169fdf0ba0a 100644 (file)
--- a/data/.htaccess
+++ b/data/.htaccess
@@ -1,2 +1,13 @@
-Allow from none
-Deny from all
+<IfModule version_module>
+  <IfVersion >= 2.4>
+     Require all denied
+  </IfVersion>
+  <IfVersion < 2.4>
+     Allow from none
+     Deny from all
+  </IfVersion>
+</IfModule>
+
+<IfModule !version_module>
+    Require all denied
+</IfModule>

diff --git a/docker/.htaccess b/docker/.htaccess
index b584d98c56a27ebb09c963313876fd8d1a3e9987..f601c1eeee5ff6e42f4eccdd43f76169fdf0ba0a 100644 (file)
--- a/docker/.htaccess
+++ b/docker/.htaccess
@@ -1,2 +1,13 @@
-Allow from none
-Deny from all
+<IfModule version_module>
+  <IfVersion >= 2.4>
+     Require all denied
+  </IfVersion>
+  <IfVersion < 2.4>
+     Allow from none
+     Deny from all
+  </IfVersion>
+</IfModule>
+
+<IfModule !version_module>
+    Require all denied
+</IfModule>

diff --git a/pagecache/.htaccess b/pagecache/.htaccess
index b584d98c56a27ebb09c963313876fd8d1a3e9987..f601c1eeee5ff6e42f4eccdd43f76169fdf0ba0a 100644 (file)
--- a/pagecache/.htaccess
+++ b/pagecache/.htaccess
@@ -1,2 +1,13 @@
-Allow from none
-Deny from all
+<IfModule version_module>
+  <IfVersion >= 2.4>
+     Require all denied
+  </IfVersion>
+  <IfVersion < 2.4>
+     Allow from none
+     Deny from all
+  </IfVersion>
+</IfModule>
+
+<IfModule !version_module>
+    Require all denied
+</IfModule>

diff --git a/tests/.htaccess b/tests/.htaccess
index b584d98c56a27ebb09c963313876fd8d1a3e9987..f601c1eeee5ff6e42f4eccdd43f76169fdf0ba0a 100644 (file)
--- a/tests/.htaccess
+++ b/tests/.htaccess
@@ -1,2 +1,13 @@
-Allow from none
-Deny from all
+<IfModule version_module>
+  <IfVersion >= 2.4>
+     Require all denied
+  </IfVersion>
+  <IfVersion < 2.4>
+     Allow from none
+     Deny from all
+  </IfVersion>
+</IfModule>
+
+<IfModule !version_module>
+    Require all denied
+</IfModule>

diff --git a/tmp/.htaccess b/tmp/.htaccess
index b584d98c56a27ebb09c963313876fd8d1a3e9987..f601c1eeee5ff6e42f4eccdd43f76169fdf0ba0a 100644 (file)
--- a/tmp/.htaccess
+++ b/tmp/.htaccess
@@ -1,2 +1,13 @@
-Allow from none
-Deny from all
+<IfModule version_module>
+  <IfVersion >= 2.4>
+     Require all denied
+  </IfVersion>
+  <IfVersion < 2.4>
+     Allow from none
+     Deny from all
+  </IfVersion>
+</IfModule>
+
+<IfModule !version_module>
+    Require all denied
+</IfModule>