Merge branch '2.3' into 2.4

fabpot · fabpot · commit 70876e9818e6 · 2014-03-14T08:17:06.000+01:00
* 2.3:
  Fixed PHPUnit doc URL
  make htaccess deny in src and app work with apache 2.4
diff --git a/app/.htaccess b/app/.htaccess
@@ -1 +1,7 @@
-deny from all
+<IfModule mod_authz_core.c>
+    Require all denied
+</IfModule>
+<IfModule !mod_authz_core.c>
+    Order deny,allow
+    Deny from all
+</IfModule>
diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
+<!-- http://phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit
     backupGlobals               = "false"
     backupStaticAttributes      = "false"
diff --git a/src/.htaccess b/src/.htaccess
@@ -1 +1,7 @@
-deny from all
+<IfModule mod_authz_core.c>
+    Require all denied
+</IfModule>
+<IfModule !mod_authz_core.c>
+    Order deny,allow
+    Deny from all
+</IfModule>
