Django

Code

Changeset 6553

Show
Ignore:
Timestamp:
10/20/07 03:31:05 (1 year ago)
Author:
mtredinnick
Message:

Fixed #5762 -- Quoted the portions that make up the URL when appending
"www." or adding a trailing slash in common middleware.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/django/middleware/common.py

    r6296 r6553  
     1import md5 
     2import re 
     3 
    14from django.conf import settings 
    25from django import http 
    36from django.core.mail import mail_managers 
    4 import md5 
    5 import re 
     7from django.utils.http import urlquote 
    68 
    79class CommonMiddleware(object): 
     
    4749            # Redirect 
    4850            if new_url[0]: 
    49                 newurl = "%s://%s%s" % (request.is_secure() and 'https' or 'http', new_url[0], new_url[1]
     51                newurl = "%s://%s%s" % (request.is_secure() and 'https' or 'http', new_url[0], urlquote(new_url[1])
    5052            else: 
    51                 newurl = new_url[1] 
     53                newurl = urlquote(new_url[1]) 
    5254            if request.GET: 
    5355                newurl += '?' + request.GET.urlencode()