Commit 4e48e5ca authored by Hanno Schlichting's avatar Hanno Schlichting

Merge c126516 from 2.13 branch

parent f6dbdda1
......@@ -381,8 +381,8 @@ class HTTPRequest(BaseRequest):
if server_url is not None:
other['SERVER_URL'] = server_url = server_url.strip()
else:
if 'HTTPS' in environ and (
environ['HTTPS'] == "on" or environ['HTTPS'] == "ON"):
https_environ = environ.get('HTTPS', False)
if https_environ and https_environ in ('on', 'ON', '1'):
protocol = 'https'
elif ('SERVER_PORT_SECURE' in environ and
environ['SERVER_PORT_SECURE'] == "1"):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment