[Lxr-commits] CVS: lxr/templates/Apache apache-lxrserver.conf, 1.4, 1.5 htaccess-generic, 1.4, 1.5

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr/templates/Apache
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13381/templates/Apache

Modified Files:
	apache-lxrserver.conf htaccess-generic 
Log Message:
templates/Apache/apache-lxrserver.conf & htaccess-generic: implement Apache 2.4 access controls

Index: apache-lxrserver.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/Apache/apache-lxrserver.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- apache-lxrserver.conf	11 Jan 2013 12:06:13 -0000	1.4
+++ apache-lxrserver.conf	19 Jan 2013 13:54:22 -0000	1.5
@@ -85,6 +85,9 @@
 <Directory "%LXRroot%">
 	Options FollowSymLinks
 	AllowOverride FileInfo Limit Options
+		# Apache 2.2 access control
 	Order allow,deny
 	Allow from all
+		# Apache 2.4 access control
+	Require all granted
 </Directory>

Index: htaccess-generic
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/Apache/htaccess-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- htaccess-generic	11 Nov 2012 14:00:40 -0000	1.4
+++ htaccess-generic	19 Jan 2013 13:54:22 -0000	1.5
@@ -14,7 +14,10 @@
 # Enable CGI script execution and use of symlinks
 Options ExecCGI FollowSymlinks
 
+		# up to Apache 2.2
 Order deny,allow
+		# from Apache 2.4
+#	No directive needed
 
 
 # =================================================
@@ -29,16 +32,25 @@
 
 # Forbid direct access to any file in LXR root and its subdirectories
 <FilesMatch ".">
+		# up to Apache 2.2
 	Deny from all
+		# from Apache 2.4
+	Require all denied
 </FilesMatch>
 
 # But allow access to style sheets
 <FilesMatch "\.css$">
+		# up to Apache 2.2
 	Allow from all
+		# from Apache 2.4
+	Require all granted
 </FilesMatch>
 # and graphic files (for icons)
 <FilesMatch "\.(bmp|gif|icon?|jpe?g|png|svg|tiff?)$">
+		# up to Apache 2.2
 	Allow from all
+		# from Apache 2.4
+	Require all granted
 </FilesMatch>