Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Changed CommonMiddleware so it doesn't assume HTTP_HOST is set.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 79be9b2e7d5e369a6bdb6f807d87529434731fb9 1 parent 3cd7755
@adrianholovaty adrianholovaty authored
Showing with 6 additions and 3 deletions.
  1. +6 −3 django/middleware/common.py
View
9 django/middleware/common.py
@@ -30,9 +30,9 @@ def process_request(self, request):
return httpwrappers.HttpResponseForbidden('<h1>Forbidden</h1>')
# Check for a redirect based on settings.APPEND_SLASH and settings.PREPEND_WWW
- old_url = [request.META['HTTP_HOST'], request.path]
+ old_url = [request.META.get('HTTP_HOST', ''), request.path]
new_url = old_url[:]
- if settings.PREPEND_WWW and not old_url[0].startswith('www.'):
+ if settings.PREPEND_WWW and old_url[0] and not old_url[0].startswith('www.'):
new_url[0] = 'www.' + old_url[0]
# Append a slash if append_slash is set and the URL doesn't have a
# trailing slash or a file extension.
@@ -40,7 +40,10 @@ def process_request(self, request):
new_url[1] = new_url[1] + '/'
if new_url != old_url:
# Redirect
- newurl = "%s://%s%s" % (os.environ.get('HTTPS') == 'on' and 'https' or 'http', new_url[0], new_url[1])
+ if new_url[0]:
+ newurl = "%s://%s%s" % (os.environ.get('HTTPS') == 'on' and 'https' or 'http', new_url[0], new_url[1])
+ else:
+ newurl = new_url[1]
if request.GET:
newurl += '?' + request.GET.urlencode()
return httpwrappers.HttpResponseRedirect(newurl)
Please sign in to comment.
Something went wrong with that request. Please try again.