Revert "merged branch Tobion/patch-2 (PR #497)"

This reverts commit 507a3f9, reversing
changes made to de036c8.

Author: fabpot

UPGRADE-2.2.md

@@ -1,10 +1,6 @@
 UPGRADE FROM 2.1 to 2.2
 =======================
 
- * The [`web/.htaccess`](https://github.com/symfony/symfony-standard/blob/2.2/web/.htaccess)
-   file changed slightly to prevent duplicate content with and without `/app.php` in the URI.
-   So you might want to update your `.htaccess` file as well.
-
  * The ``_internal`` route is not used any more. It should then be removed
    from both your routing and security configurations. A ``fragments`` key has
    been added to the framework configuration and must be specified when ESI or

web/.htaccess

@@ -5,10 +5,6 @@
     #    RewriteBase /
     #</IfModule>
 
-    # redirect to URI without front controller to prevent duplicate content
-    RewriteRule ^app\.php(/(.*)|$) /$2 [R=301,END]
-
-    # rewrite requests to non-existent files to front controller
     RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^(.*)$ app.php [END]
+    RewriteRule ^(.*)$ app.php [QSA,L]
 </IfModule>