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

Fixed #4986 -- Improved get_host() host detection. Thanks, SmileyChris. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6166 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-09-14 05:39:42 +00:00
parent 30b24a6cce
commit 300e19effc
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/http/__init__.py
View File

@ -379,9 +379,16 @@ class HttpResponseServerError(HttpResponse):
def get_host(request): def get_host(request):
"Gets the HTTP host from the environment or request headers." "Gets the HTTP host from the environment or request headers."
# We try three options, in order of decreasing preference.
host = request.META.get('HTTP_X_FORWARDED_HOST', '') host = request.META.get('HTTP_X_FORWARDED_HOST', '')
if not host: if 'HTTP_HOST' in request.META:
host = request.META.get('HTTP_HOST', '') host = request.META['HTTP_HOST']
else:
# Reconstruct the host using the algorithm from PEP 333.
host = request.META['SERVER_NAME']
server_port = request.META['SERVER_PORT']
if server_port != (request.is_secure() and 443 or 80):
host = '%s:%s' % (host, server_port)
return host return host
# It's neither necessary nor appropriate to use # It's neither necessary nor appropriate to use