--- trunk/phpmyadmin/phpmyadmin.conf	2007/07/08 13:32:34	250
+++ trunk/phpmyadmin/phpmyadmin.conf	2015/09/08 10:28:01	2692
@@ -6,26 +6,69 @@
 # dangerous unless properly secured by SSL
 
 Alias /phpmyadmin /usr/share/phpmyadmin
+
 <Directory /usr/share/phpmyadmin/>
-	order deny,allow
-	deny from all
-	allow from 127.0.0.1
+	AddDefaultCharset UTF-8
+
+	<IfModule mod_authz_core.c>
+		# Apache 2.4
+		<RequireAny>
+			Require ip 127.0.0.1
+			Require ip ::1
+		</RequireAny>
+	</IfModule>
+	<IfModule !mod_authz_core.c>
+		# Apache 2.2
+		Order Deny,Allow
+		Deny from All
+		Allow from 127.0.0.1
+		Allow from ::1
+	</IfModule>
+</Directory>
+
+<Directory /usr/share/phpmyadmin/setup/>
+	<IfModule mod_authz_core.c>
+		# Apache 2.4
+		<RequireAny>
+			Require ip 127.0.0.1
+			Require ip ::1
+		</RequireAny>
+	</IfModule>
+	<IfModule !mod_authz_core.c>
+		# Apache 2.2
+		Order Deny,Allow
+		Deny from All
+		Allow from 127.0.0.1
+		Allow from ::1
+	</IfModule>
 </Directory>
 
 # This directory does not require access over HTTP - taken from the original
 # phpMyAdmin upstream tarball
 #
-<Directory /usr/share/phpmyadmin/libraries>
+<Directory /usr/share/phpmyadmin/libraries/>
+	Order Deny,Allow
+	Deny from All
+	Allow from None
+</Directory>
+
+<Directory /usr/share/phpmyadmin/setup/lib/>
+	Order Deny,Allow
+	Deny from All
+	Allow from None
+</Directory>
+
+<Directory /usr/share/phpmyadmin/setup/frames/>
 	Order Deny,Allow
 	Deny from All
 	Allow from None
 </Directory>
 
 # This configuration prevents mod_security at phpmyadmin directories from
-# filtering SQL etc.
+# filtering SQL etc. This may break your mod_security implementation.
 #
-<IfModule mod_security.c>
-	<LocationMatch "/phpmyadmin/(.+)">
-		SecFilterInheritance Off
-	</LocationMatch>
-</IfModule>
+#<IfModule mod_security.c>
+#	<Directory /usr/share/phpmyadmin/>
+#		SecRuleInheritance Off
+#	</Directory>
+#</IfModule>