- Patch #109150 by ff1 and webernet: fix rewrite rule.

Backport from HEAD.

.htaccess

@@ -66,18 +66,21 @@ DirectoryIndex index.php
 <IfModule mod_rewrite.c>
   RewriteEngine on
 
-  # If your site can be accessed both with and without the prefix www. you
+  # If your site can be accessed both with and without the 'www.' prefix, you
-  # can use one of the following settings to force user to use only one option:
+  # can use one of the following settings to redirect users to your preferred
+  # URL, either WITH or WITHOUT the 'www.' prefix. Choose ONLY one option:
   #
-  # If you want the site to be accessed WITH the www. only, adapt and
+  # To redirect all users to access the site WITH the 'www.' prefix,
-  # uncomment the following:
+  # (http://example.com/... will be redirected to http://www.example.com/...)
+  # adapt and uncomment the following:
   # RewriteCond %{HTTP_HOST} ^example\.com$ [NC]
-  # RewriteRule .* http://www.example.com/ [L,R=301]
+  # RewriteRule ^(.*)$ http://www.example.com/$1 [L,R=301]
   #
-  # If you want the site to be accessed only WITHOUT the www. prefix, adapt
+  # To redirect all users to access the site WITHOUT the 'www.' prefix,
-  # and uncomment the following:
+  # (http://www.example.com/... will be redirected to http://example.com/...)
+  # adapt and uncomment the following:
   # RewriteCond %{HTTP_HOST} ^www\.example\.com$ [NC]
-  # RewriteRule .* http://example.com/ [L,R=301]
+  # RewriteRule ^(.*)$ http://example.com/$1 [L,R=301]
 
   # Modify the RewriteBase if you are using Drupal in a subdirectory and
   # the rewrite rules are not working properly.