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

This PR was merged into the 2.2 branch.

Commits
-------

99106de added info about changed .htaccess
b46c01a removed QSA flag that is not needed
7da3383 redirect /app.php to prevent duplicate content

Discussion
----------

redirect /app.php to prevent duplicate content

bc break: no
fix #469

---------------------------------------------------------------------------

by Tobion at 2013-02-22T12:43:02Z

@fabpot finished and tested.

---------------------------------------------------------------------------

by vicb at 2013-02-22T12:59:01Z

What about removing the L flag altogether ?

---------------------------------------------------------------------------

by Tobion at 2013-02-22T13:00:53Z

Right we can do that because END includes L

> Using the [END] flag terminates not only the current round of rewrite processing (like [L]) ...

---------------------------------------------------------------------------

by Tobion at 2013-02-22T13:12:06Z

@vicb done.

Author: fabpot

UPGRADE-2.2.md

@@ -1,6 +1,10 @@
 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 ``framgents`` key has
    been added to the framework configuration and must be specified when ESI or

web/.htaccess

@@ -5,6 +5,10 @@
     #    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 [QSA,L]
+    RewriteRule ^(.*)$ app.php [END]
 </IfModule>