Ticket #2476: common-update.diff

django/middleware/common.py

@@ -29 +29 @@
                 if user_agent_regex.search(request.META['HTTP_USER_AGENT']):
                     return http.HttpResponseForbidden('<h1>Forbidden</h1>')
 
-        # Check for a redirect based on settings.APPEND_SLASH and settings.PREPEND_WWW
+        # Check for a redirect based on settings.APPEND_SLASH, settings.PREPEND_WWW, and settings.REMOVE_WWW
         host = http.get_host(request)
         old_url = [host, request.path]
         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]
+        if settings.REMOVE_WWW and old_url[0] and old_url[0].startswith('www.'):
+            new_url[0] = old_url[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]):