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

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

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

Modified Files:
	apache-lxrserver.conf htaccess-generic 
Log Message:
templates/Apache/apache-lxrserver.conf, -/htaccess-generic: improve 2.4/2.6 access control separation

Index: apache-lxrserver.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/Apache/apache-lxrserver.conf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- apache-lxrserver.conf	17 Nov 2013 09:15:55 -0000	1.8
+++ apache-lxrserver.conf	10 Mar 2014 16:40:27 -0000	1.9
@@ -201,9 +201,17 @@
 	Options FollowSymLinks
 	AllowOverride AuthConfig FileInfo Limit Options
 		# Apache 2.2 access control
+#@IF 'y' eq "%Apache24%"
+#	Order allow,deny
+#@ELSE
 	Order allow,deny
+#@ENDIF
 		# up to Apache 2.2
+#@IF 'y' eq "%Apache24%"
+#	Allow from all
+#@ELSE
 	Allow from all
+#@ENDIF
 		# from Apache 2.4
 #@IF 'y' eq "%Apache24%"
 	Require all granted

Index: htaccess-generic
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/Apache/htaccess-generic,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- htaccess-generic	17 Nov 2013 09:15:55 -0000	1.8
+++ htaccess-generic	10 Mar 2014 16:40:27 -0000	1.9
@@ -22,7 +22,11 @@
 Options ExecCGI FollowSymlinks
 
 		# up to Apache 2.2
+#@IF 'y' eq "%Apache24%"
+#	Order deny,allow
+#@ELSE
 Order deny,allow
+#@ENDIF
 		# from Apache 2.4
 #	No directive needed
 
@@ -40,7 +44,11 @@
 # Forbid direct access to any file in LXR root and its subdirectories
 <FilesMatch ".">
 		# up to Apache 2.2
+#@IF 'y' eq "%Apache24%"
+#	Deny from all
+#@ELSE
 	Deny from all
+#@ENDIF
 		# from Apache 2.4
 #@IF 'y' eq "%Apache24%"
 	Require all denied
@@ -52,7 +60,11 @@
 # But allow access to style sheets
 <FilesMatch "\.css$">
 		# up to Apache 2.2
+#@IF 'y' eq "%Apache24%"
+#	Allow from all
+#@ELSE
 	Allow from all
+#@ENDIF
 		# from Apache 2.4
 #@IF 'y' eq "%Apache24%"
 	Require all granted
@@ -63,7 +75,11 @@
 # and graphic files (for icons)
 <FilesMatch "\.(bmp|gif|icon?|jpe?g|png|svg|tiff?)$">
 		# up to Apache 2.2
+#@IF 'y' eq "%Apache24%"
+#	Allow from all
+#@ELSE
 	Allow from all
+#@ENDIF
 		# from Apache 2.4
 #@IF 'y' eq "%Apache24%"
 	Require all granted
@@ -80,7 +96,11 @@
 #
 <Files ~ (search|source|ident|diff|showconfig)$>
 		# up to Apache 2.2
+#@IF 'y' eq "%Apache24%"
+#	Allow from all
+#@ELSE
 	Allow from all
+#@ENDIF
 		# from Apache 2.4
 #@IF 'y' eq "%Apache24%"
 	Require all granted