Fixed #19910 -- Added slash to i18n redirect if APPEND_SLASH is set.

This introduces a force_append_slash argument for request.get_full_path()
which is used by RedirectFallbackMiddleware and CommonMiddleware when
handling redirects for settings.APPEND_SLASH.

1 files changed, 4 insertions, 18 deletions

diff --git a/django/middleware/common.py b/django/middleware/common.py
index 6c5843220f..dad1e6b2eb 100644
--- a/django/middleware/common.py
+++ b/django/middleware/common.py
@@ -6,9 +6,7 @@ from django import http
 from django.conf import settings
 from django.core import urlresolvers
 from django.core.mail import mail_managers
-from django.utils import six
 from django.utils.encoding import force_text
-from django.utils.http import urlquote
 
 logger = logging.getLogger('django.request')
 
@@ -60,7 +58,7 @@ class CommonMiddleware(object):
         # Check for a redirect based on settings.APPEND_SLASH
         # and settings.PREPEND_WWW
         host = request.get_host()
-        old_url = [host, request.path]
+        old_url = [host, request.get_full_path()]
         new_url = old_url[:]
 
         if (settings.PREPEND_WWW and old_url[0] and
@@ -73,7 +71,7 @@ class CommonMiddleware(object):
             urlconf = getattr(request, 'urlconf', None)
             if (not urlresolvers.is_valid_path(request.path_info, urlconf) and
                     urlresolvers.is_valid_path("%s/" % request.path_info, urlconf)):
-                new_url[1] = new_url[1] + '/'
+                new_url[1] = request.get_full_path(force_append_slash=True)
                 if settings.DEBUG and request.method in ('POST', 'PUT', 'PATCH'):
                     raise RuntimeError((""
                     "You called this URL via %(method)s, but the URL doesn't end "
@@ -89,21 +87,9 @@ class CommonMiddleware(object):
         if new_url[0] != old_url[0]:
             newurl = "%s://%s%s" % (
                 request.scheme,
-                new_url[0], urlquote(new_url[1]))
+                new_url[0], new_url[1])
         else:
-            newurl = urlquote(new_url[1])
-        if request.META.get('QUERY_STRING', ''):
-            if six.PY3:
-                newurl += '?' + request.META['QUERY_STRING']
-            else:
-                # `query_string` is a bytestring. Appending it to the unicode
-                # string `newurl` will fail if it isn't ASCII-only. This isn't
-                # allowed; only broken software generates such query strings.
-                # Better drop the invalid query string than crash (#15152).
-                try:
-                    newurl += '?' + request.META['QUERY_STRING'].decode()
-                except UnicodeDecodeError:
-                    pass
+            newurl = new_url[1]
         return self.response_redirect_class(newurl)
 
     def process_response(self, request, response):