p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #4986 -- Fixed a logic bug from [6166]. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6449 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-10-03 22:21:43 +00:00
parent 2a63414ccd
commit 4d8b51f60c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/http/__init__.py
View File

@ -47,8 +47,9 @@ class HttpRequest(object):
def get_host(self): def get_host(self):
"Returns the HTTP host using the environment or request headers." "Returns the HTTP host using the environment or request headers."
# We try three options, in order of decreasing preference. # We try three options, in order of decreasing preference.
host = self.META.get('HTTP_X_FORWARDED_HOST', '') if 'HTTP_X_FORWARDED_HOST' in self.META:
if 'HTTP_HOST' in self.META: host = self.META['HTTP_X_FORWARDED_HOST']
elif 'HTTP_HOST' in self.META:
host = self.META['HTTP_HOST'] host = self.META['HTTP_HOST']
else: else:
# Reconstruct the host using the algorithm from PEP 333. # Reconstruct the host using the algorithm from PEP 333.