Merge branch '2.6' into 2.7

fabpot · fabpot · commit ccc0bae3fc02 · 2015-02-18T11:11:39.000+01:00
* 2.6:
  Disabled MultiViews in .htaccess
diff --git a/web/.htaccess b/web/.htaccess
@@ -5,6 +5,12 @@
 # to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl).
 DirectoryIndex app.php
 
+# Disabling MultiViews prevents unwanted negotiation, e.g. "/app" should not resolve
+# to the front controller "/app.php" but be rewritten to "/app.php/app".
+<IfModule mod_negotiation.c>
+    Options -MultiViews
+</IfModule>
+
 <IfModule mod_rewrite.c>
     RewriteEngine On
 
