From: Robert Scheck <robert@fedoraproject.org>
Date: Mon, 2 Apr 2018 00:28:26 +0000 (+0200)
Subject: Update .htaccess for Apache 2.4 to avoid mod_access_compat dependency
X-Git-Tag: release-3.5.4~437^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0eb1e3a9d2db2ddaa9dfec9e53dada8adb687e3e;p=kivitendo-erp.git

Update .htaccess for Apache 2.4 to avoid mod_access_compat dependency

See also: https://httpd.apache.org/docs/2.4/upgrading.html
---

diff --git a/.htaccess b/.htaccess
index 66862278a..977b220d9 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,11 +1,19 @@
 ### Choose a character set (just in case you like to change it here)
-### uncommit the line you wish to activate
+### uncomment the line you wish to activate
 #AddDefaultCharset ISO-8859-15
 #AddDefaultCharset UTF-8
 
 ### simple access control by client ip
-### uncomment the lines starting with Order ..., Deny ... and Allow ...
-### examples: "Allow from 192.168" or "Allow from 192.168.1" or "Allow from 192.168.178" or "Allow from 217.84.201.2"
-#Order deny,allow
-#Deny from all
-#Allow from 192.168
+### uncomment the lines starting with <IfModule ...> until last </IfModule>
+### examples for Apache >= 2.4: "Require ip 192.168" or "Require ip 192.168.1" or "Require ip 192.168.178" or "Require ip 217.84.201.2"
+### examples for Apache <= 2.2: "Allow from 192.168" or "Allow from 192.168.1" or "Allow from 192.168.178" or "Allow from 217.84.201.2"
+#<IfModule mod_authz_core.c>
+#  # Apache 2.4
+#  Require ip 192.168
+#</IfModule>
+#<IfModule !mod_authz_core.c>
+#  # Apache 2.2
+#  Order deny,allow
+#  Deny from all
+#  Allow from 192.168
+#</IfModule>
diff --git a/SL/.htaccess b/SL/.htaccess
index 0a9a0473a..cde5b4437 100644
--- a/SL/.htaccess
+++ b/SL/.htaccess
@@ -1,2 +1,9 @@
-Order Allow,Deny
-Deny from all
+<IfModule mod_authz_core.c>
+  # Apache 2.4
+  Require all denied
+</IfModule>
+<IfModule !mod_authz_core.c>
+  # Apache 2.2
+  Order deny,allow
+  Deny from all
+</IfModule>
diff --git a/bin/mozilla/.htaccess b/bin/mozilla/.htaccess
index 0a9a0473a..cde5b4437 100644
--- a/bin/mozilla/.htaccess
+++ b/bin/mozilla/.htaccess
@@ -1,2 +1,9 @@
-Order Allow,Deny
-Deny from all
+<IfModule mod_authz_core.c>
+  # Apache 2.4
+  Require all denied
+</IfModule>
+<IfModule !mod_authz_core.c>
+  # Apache 2.2
+  Order deny,allow
+  Deny from all
+</IfModule>
diff --git a/config/.htaccess b/config/.htaccess
index 0a9a0473a..cde5b4437 100644
--- a/config/.htaccess
+++ b/config/.htaccess
@@ -1,2 +1,9 @@
-Order Allow,Deny
-Deny from all
+<IfModule mod_authz_core.c>
+  # Apache 2.4
+  Require all denied
+</IfModule>
+<IfModule !mod_authz_core.c>
+  # Apache 2.2
+  Order deny,allow
+  Deny from all
+</IfModule>
diff --git a/locale/.htaccess b/locale/.htaccess
index 0a9a0473a..cde5b4437 100644
--- a/locale/.htaccess
+++ b/locale/.htaccess
@@ -1,2 +1,9 @@
-Order Allow,Deny
-Deny from all
+<IfModule mod_authz_core.c>
+  # Apache 2.4
+  Require all denied
+</IfModule>
+<IfModule !mod_authz_core.c>
+  # Apache 2.2
+  Order deny,allow
+  Deny from all
+</IfModule>
diff --git a/scripts/.htaccess b/scripts/.htaccess
index 0a9a0473a..cde5b4437 100644
--- a/scripts/.htaccess
+++ b/scripts/.htaccess
@@ -1,2 +1,9 @@
-Order Allow,Deny
-Deny from all
+<IfModule mod_authz_core.c>
+  # Apache 2.4
+  Require all denied
+</IfModule>
+<IfModule !mod_authz_core.c>
+  # Apache 2.2
+  Order deny,allow
+  Deny from all
+</IfModule>
diff --git a/t/.htaccess b/t/.htaccess
index 0a9a0473a..cde5b4437 100644
--- a/t/.htaccess
+++ b/t/.htaccess
@@ -1,2 +1,9 @@
-Order Allow,Deny
-Deny from all
+<IfModule mod_authz_core.c>
+  # Apache 2.4
+  Require all denied
+</IfModule>
+<IfModule !mod_authz_core.c>
+  # Apache 2.2
+  Order deny,allow
+  Deny from all
+</IfModule>
diff --git a/templates/.htaccess b/templates/.htaccess
index 0a9a0473a..cde5b4437 100644
--- a/templates/.htaccess
+++ b/templates/.htaccess
@@ -1,2 +1,9 @@
-Order Allow,Deny
-Deny from all
+<IfModule mod_authz_core.c>
+  # Apache 2.4
+  Require all denied
+</IfModule>
+<IfModule !mod_authz_core.c>
+  # Apache 2.2
+  Order deny,allow
+  Deny from all
+</IfModule>