From c62be0146584cfd63105ea6e68c2de188e835cce Mon Sep 17 00:00:00 2001 From: ianb Date: Thu, 4 Jan 2007 00:37:19 +0000 Subject: Respect HTTP_HOST over SERVER_PORT in construct_url --- paste/request.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'paste/request.py') diff --git a/paste/request.py b/paste/request.py index 24de9b8..cc9bf00 100644 --- a/paste/request.py +++ b/paste/request.py @@ -202,16 +202,15 @@ def construct_url(environ, with_query_string=True, with_path_info=True, url = environ['wsgi.url_scheme']+'://' if environ.get('HTTP_HOST'): - url += environ['HTTP_HOST'].split(':')[0] + url += environ['HTTP_HOST'].split(':') else: url += environ['SERVER_NAME'] - - if environ['wsgi.url_scheme'] == 'https': - if environ['SERVER_PORT'] != '443': - url += ':' + environ['SERVER_PORT'] - else: - if environ['SERVER_PORT'] != '80': - url += ':' + environ['SERVER_PORT'] + if environ['wsgi.url_scheme'] == 'https': + if environ['SERVER_PORT'] != '443': + url += ':' + environ['SERVER_PORT'] + else: + if environ['SERVER_PORT'] != '80': + url += ':' + environ['SERVER_PORT'] if script_name is None: url += urllib.quote(environ.get('SCRIPT_NAME','')) -- cgit v1.2.1