From 0eb1e3a9d2db2ddaa9dfec9e53dada8adb687e3e Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 2 Apr 2018 02:28:26 +0200 Subject: [PATCH] Update .htaccess for Apache 2.4 to avoid mod_access_compat dependency See also: https://httpd.apache.org/docs/2.4/upgrading.html --- .htaccess | 20 ++++++++++++++------ SL/.htaccess | 11 +++++++++-- bin/mozilla/.htaccess | 11 +++++++++-- config/.htaccess | 11 +++++++++-- locale/.htaccess | 11 +++++++++-- scripts/.htaccess | 11 +++++++++-- t/.htaccess | 11 +++++++++-- templates/.htaccess | 11 +++++++++-- 8 files changed, 77 insertions(+), 20 deletions(-) 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 until last +### 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" +# +# # Apache 2.4 +# Require ip 192.168 +# +# +# # Apache 2.2 +# Order deny,allow +# Deny from all +# Allow from 192.168 +# 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 + + # Apache 2.4 + Require all denied + + + # Apache 2.2 + Order deny,allow + Deny from all + 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 + + # Apache 2.4 + Require all denied + + + # Apache 2.2 + Order deny,allow + Deny from all + 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 + + # Apache 2.4 + Require all denied + + + # Apache 2.2 + Order deny,allow + Deny from all + 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 + + # Apache 2.4 + Require all denied + + + # Apache 2.2 + Order deny,allow + Deny from all + 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 + + # Apache 2.4 + Require all denied + + + # Apache 2.2 + Order deny,allow + Deny from all + 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 + + # Apache 2.4 + Require all denied + + + # Apache 2.2 + Order deny,allow + Deny from all + 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 + + # Apache 2.4 + Require all denied + + + # Apache 2.2 + Order deny,allow + Deny from all + -- 2.20.1