Accepting request 205788 from home:fdekruijf:branches:Apache

Removed obsolete directive DefaultType bnc#848146
Changed access control to use new Require type directives

OBS-URL: https://build.opensuse.org/request/show/205788
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=397

apache2-default-server.conf

@@ -25,8 +25,7 @@ DocumentRoot "/srv/www/htdocs"
 	#   Options FileInfo AuthConfig Limit
 	AllowOverride None
 	# Controls who can get stuff from this server.
-	Order allow,deny
-	Allow from all
+	Require all granted
 </Directory>
 
 # Aliases: aliases can be added as needed (with no limit). The format is 
@@ -46,8 +45,7 @@ Alias /icons/ "/usr/share/apache2/icons/"
 <Directory "/usr/share/apache2/icons">
 	Options Indexes MultiViews
 	AllowOverride None
-	Order allow,deny
-	Allow from all
+	Require all granted
 </Directory>
 
 # ScriptAlias: This controls which directories contain server scripts.
@@ -65,8 +63,7 @@ ScriptAlias /cgi-bin/ "/srv/www/cgi-bin/"
 <Directory "/srv/www/cgi-bin">
 	AllowOverride None
 	Options +ExecCGI -Includes
-	Order allow,deny
-	Allow from all
+	Require all granted
 </Directory>
 
 # UserDir: The name of the directory that is appended onto a user's home

apache2-default-vhost-ssl.conf

@@ -190,15 +190,18 @@
 	#AuthUserFile /srv/www/passwd/default
 
 	#
-	# Controls who can get stuff from this server.
+	# Controls who can get stuff from this server. The example gives access to:
+	# either a valid user, a user on the same system as the server, a system
+	# which name ends with .example.com and of which the reverse lookup of the
+	# IP address matches with the IP address that has been received by looking
+	# up that name in the DNS irrespective of any setting of HostnameLookups.
 	#
 	#<limit GET POST>
-	#  Require valid-user
-	#  Order Deny,Allow
-	#  Deny from All
-	#  Allow from 127.0.0.1
-	#  Allow from .example.com
-	#  Satisfy any
+	#  <RequireAny>
+	#    Require valid-user
+	#    Require local
+	#    Require host .example.com
+	#  </RequireAny>
 	#</limit>
     </Directory>
 

apache2-default-vhost.conf

@@ -52,8 +52,7 @@
     <Directory "/srv/www/cgi-bin">
 	AllowOverride None
 	Options +ExecCGI -Includes
-	Order allow,deny
-	Allow from all
+	Require all granted
     </Directory>
 
 
@@ -109,8 +108,7 @@
 	#
 	# Controls who can get stuff from this server.
 	#
-	Order allow,deny
-	Allow from all
+	Require all granted
     
     </Directory>
 

apache2-errors.conf

@@ -40,8 +40,7 @@ Alias /error/ "/usr/share/apache2/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>

apache2-httpd.conf

@@ -137,7 +137,6 @@ Include /etc/apache2/mod_autoindex-defaults.conf
 
 # associate MIME types with filename extensions
 TypesConfig /etc/apache2/mime.types
-DefaultType text/plain
 Include /etc/apache2/mod_mime-defaults.conf
 
 # set up (customizable) error responses
@@ -151,16 +150,14 @@ Include /etc/apache2/ssl-global.conf
 <Directory />
     Options None
     AllowOverride None
-    Order deny,allow
-    Deny from all
+    Require all denied
 </Directory>
 
 # use .htaccess files for overriding,
 AccessFileName .htaccess
 # and never show them
 <Files ~ "^\.ht">
-    Order allow,deny
-    Deny from all
+    Require all denied
 </Files>
 
 # List of resources to look for when the client requests a directory

apache2-manual.conf

@@ -2,15 +2,14 @@
 # This configuration file belongs to the apache2-doc package.
 #
 # The alias provides the manual, even if you choose to move your DocumentRoot.
-# this out if you do not care for the documentation.
+# Comment this out if you do not care for the documentation.
 #
 AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "/usr/share/apache2/manual$1"
 
 <Directory "/usr/share/apache2/manual">
     Options Indexes
     AllowOverride None
-    Order allow,deny
-    Allow from all
+    Require all granted
 
     <Files *.html>
         SetHandler type-map

apache2-mod_info.conf

@@ -7,9 +7,7 @@
 <IfModule mod_info.c>
     <Location /server-info>
 	    SetHandler server-info
-	    Order deny,allow
-	    Deny from all
-	    Allow from localhost
+	    Require local
     </Location>
 </IfModule>
 

apache2-mod_status.conf

@@ -7,9 +7,7 @@
 <IfModule mod_status.c>
     <Location /server-status>
 	SetHandler server-status
-	Order deny,allow
-	Deny from all
-	Allow from localhost 127.0.0.1
+	Require local
     </Location>
 </IfModule>
 

apache2-mod_userdir.conf

@@ -31,13 +31,11 @@
 		Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
 
 		<Limit GET POST OPTIONS PROPFIND>
-			Order allow,deny
-			Allow from all
+			Require all granted
 		</Limit>
 
 		<LimitExcept GET POST OPTIONS PROPFIND>
-			Order deny,allow
-			Deny from all
+			Require all denied
 		</LimitExcept>
 
 	</Directory>

apache2-vhost.template

@@ -60,8 +60,7 @@
     <Directory "/srv/www/vhosts/dummy-host.example.com/cgi-bin">
 	AllowOverride None
 	Options +ExecCGI -Includes
-	Order allow,deny
-	Allow from all
+	Require all granted
     </Directory>
 
 
@@ -116,8 +115,7 @@
 	#
 	# Controls who can get stuff from this server.
 	#
-	Order allow,deny
-	Allow from all
+	Require all granted
     
     </Directory>
 

apache2.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov  4 20:55:52 UTC 2013 - freek@opensuse.org
+
+- Removed obsolete directive DefaultType
+- Changed all access control to new Require directive
+
 -------------------------------------------------------------------
 Fri Oct 25 00:05:02 UTC 2013 - crrodriguez@opensuse.org