#56634: Resolve issues with varying $base_url

- Fix locations links in watchdog
- Fix repeated subdirectory in page cache CIDs

1 files changed, 12 insertions, 0 deletions

diff --git a/.htaccess b/.htaccess
index 16193a2a0..df1209ccb 100644
--- a/.htaccess
+++ b/.htaccess
@@ -51,6 +51,18 @@ DirectoryIndex index.php
 <IfModule mod_rewrite.c>
   RewriteEngine on
 
+  # If your site can be accessed both with and without the prefix www.
+  # you can use one of the following settings to force user to use only one option:
+  #
+  # If you want the site to be accessed WITH the www. only, adapt and comment out the following:
+  # RewriteCond %{HTTP_HOST} !^www\.example\.com$ [NC]
+  # RewriteRule .* http://www.example.com/ [L,R=301]
+  #
+  # If you want the site to be accessed only WITHOUT the www. , adapt and comment out the following:
+  # RewriteCond %{HTTP_HOST} !^example\.com$ [NC]
+  # RewriteRule .* http://example.com/ [L,R=301]
+
+
   # Modify the RewriteBase if you are using Drupal in a subdirectory and
   # the rewrite rules are not working properly.
   #RewriteBase /drupal