From: Bartosz Świątek <shadzik@tld-linux.org>
Date: Sun, 26 Feb 2012 20:53:09 +0000 (+0100)
Subject: - 2.4 access control syntax
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=refs%2Fheads%2Fhttpd-2_4;p=packages%2Fapache.git

- 2.4 access control syntax
- clear 2.4 TODO
---

diff --git a/apache-common.conf b/apache-common.conf
index 05686e9..8643668 100644
--- a/apache-common.conf
+++ b/apache-common.conf
@@ -16,8 +16,7 @@ DocumentRoot "/home/services/httpd/html"
 	Options FollowSymLinks
 	AllowOverride None
 	<IfModule mod_authz_host.c>
-		Order deny,allow
-		Deny from all
+		Require all denied
 	</IfModule>
 </Directory>
 
@@ -50,8 +49,7 @@ DocumentRoot "/home/services/httpd/html"
 	# Controls who can get stuff from this server.
 	#
 	<IfModule mod_authz_host.c>
-		Order allow,deny
-		Allow from all
+		Require all granted
 	</IfModule>
 
 </Directory>
diff --git a/apache-example.net.conf b/apache-example.net.conf
index 2d65d7f..90a938b 100644
--- a/apache-example.net.conf
+++ b/apache-example.net.conf
@@ -18,7 +18,6 @@
 #  AllowOverride None
 #  Options None
 #  <IfModule mod_authz_host.c>
-#    Order allow,deny
-#    Allow from all
+#	Require all granted
 #  </IfModule>
 #</Directory>
diff --git a/apache-manual.conf b/apache-manual.conf
index a94735d..77edb70 100644
--- a/apache-manual.conf
+++ b/apache-manual.conf
@@ -12,8 +12,7 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ "/home/services/h
 <Directory "/home/services/httpd/manual">
 	Options Indexes
 	AllowOverride None
-	Order allow,deny
-	Allow from all
+	Require all granted
 
 	<Files *.html>
 		SetHandler type-map
diff --git a/apache-mod_authz_host.conf b/apache-mod_authz_host.conf
index cf9c259..6792035 100644
--- a/apache-mod_authz_host.conf
+++ b/apache-mod_authz_host.conf
@@ -1,4 +1,3 @@
-
 LoadModule authz_host_module modules/mod_authz_host.so
 
 # The following lines prevent .htaccess and .htpasswd files from being
@@ -6,7 +5,6 @@ LoadModule authz_host_module modules/mod_authz_host.so
 #
 <IfModule authz_host_module>
 	<FilesMatch "^\.ht">
-		Order allow,deny
-		Deny from all
+		Require all denied
 	</FilesMatch>
 </IfModule>
diff --git a/apache-mod_autoindex.conf b/apache-mod_autoindex.conf
index a8fb2ed..e23c0a1 100644
--- a/apache-mod_autoindex.conf
+++ b/apache-mod_autoindex.conf
@@ -1,4 +1,3 @@
-
 LoadModule autoindex_module	modules/mod_autoindex.so
 
 #
@@ -26,8 +25,7 @@ Alias /icons/ "/home/services/httpd/icons/"
 	Options Indexes MultiViews
 	AllowOverride None
 	<IfModule mod_authz_host.c>
-		Order allow,deny
-		Allow from all
+		Require all granted
 	</IfModule>
 </Directory>
 
diff --git a/apache-mod_info.conf b/apache-mod_info.conf
index 6ede0b0..0b8bc14 100644
--- a/apache-mod_info.conf
+++ b/apache-mod_info.conf
@@ -14,9 +14,7 @@ LoadModule info_module		modules/mod_info.so
 #
 <Location /server-info>
 	SetHandler server-info
-	Order deny,allow
-	Deny from all
-	Allow from 127.0.0.1
+	Require local
 </Location>
 
 </IfModule>
diff --git a/apache-mod_proxy.conf b/apache-mod_proxy.conf
index 8b21e9c..31c7afc 100644
--- a/apache-mod_proxy.conf
+++ b/apache-mod_proxy.conf
@@ -20,9 +20,8 @@ ProxyRequests On
 # http://victim:25/ and sending raw data.
 #
 <Proxy *>
-	Order deny,allow
-	Deny from all
-#	Allow from .your-domain.com
+	Require all denied
+#	Require host .your-domain.com
 </Proxy>
 
 #
diff --git a/apache-mod_status.conf b/apache-mod_status.conf
index 62e9b2a..9851db4 100644
--- a/apache-mod_status.conf
+++ b/apache-mod_status.conf
@@ -15,9 +15,7 @@ LoadModule status_module		modules/mod_status.so
 
 <Location /server-status>
 	SetHandler server-status
-	Order deny,allow
-	Deny from all
-	Allow from 127.0.0.1
+	Require local
 </Location>
 
 #
diff --git a/apache-mod_userdir.conf b/apache-mod_userdir.conf
index 9675227..8e8ce28 100644
--- a/apache-mod_userdir.conf
+++ b/apache-mod_userdir.conf
@@ -21,12 +21,10 @@ UserDir public_html
 	AllowOverride FileInfo AuthConfig Limit Indexes
 	Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
 	<Limit GET POST OPTIONS>
-		Order allow,deny
-		Allow from all
+		Require all granted
 	</Limit>
 	<LimitExcept GET POST OPTIONS>
-		Order deny,allow
-		Deny from all
+		Require all denied
 	</LimitExcept>
 	#<IfModule mod_php.c>
 	#	php_admin_value open_basedir "/home/users:/usr/share/pear:/usr/share/php:/tmp"
diff --git a/apache-multilang-errordoc.conf b/apache-multilang-errordoc.conf
index f865b6f..0cc6af5 100644
--- a/apache-multilang-errordoc.conf
+++ b/apache-multilang-errordoc.conf
@@ -26,8 +26,7 @@ Alias /error/ "/home/services/httpd/error/"
 	Options IncludesNoExec
 	AddOutputFilter Includes html
 	AddHandler type-map var
-	Order allow,deny
-	Allow from all
+	Require all granted
 	LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr
 	ForceLanguagePriority Prefer Fallback
 </Directory>
diff --git a/apache.spec b/apache.spec
index 04e62f6..4203cf2 100644
--- a/apache.spec
+++ b/apache.spec
@@ -10,12 +10,6 @@
 # - mod_auth_digest and mod_auth_basic R: apache(authn) ?
 # - FYI: http://wiki.apache.org/httpd/InternalDummyConnection
 
-
-# 2.4 TODO
-#
-# add new access control syntax to configs by default (mod_access_compat provides old syntax)
-
-
 # Conditional build:
 %bcond_without	ssl		# build without SSL support
 %bcond_without	ldap		# build without LDAP support