Ticket #2112: strip_www2.diff

django/conf/global_settings.py

@@ -148 +148 @@
 # Whether to prepend the "www." subdomain to URLs that don't have it.
 PREPEND_WWW = False
 
+# Alternatively, whether to strip the "www." subdomain from URLs that have it.
+STRIP_WWW = False
+
 # List of compiled regular expression objects representing User-Agent strings
 # that are not allowed to visit any page, systemwide. Use this for bad
 # robots/crawlers. Here are a few examples:

django/middleware/common.py

@@ -35 +35 @@
         new_url = old_url[:]
         if settings.PREPEND_WWW and old_url[0] and not old_url[0].startswith('www.'):
             new_url[0] = 'www.' + old_url[0]
+        elif settings.STRIP_WWW and old_url[0] and old_url[0].startswith('www.'):
+            new_url[0] = old_url[0][4:]
         # Append a slash if append_slash is set and the URL doesn't have a
         # trailing slash or a file extension.
         if settings.APPEND_SLASH and (old_url[1][-1] != '/') and ('.' not in old_url[1].split('/')[-1]):