Merge c126516 from 2.13 branch

4e48e5ca · Hanno Schlichting · f6dbdda1 · 4e48e5ca
Commit 4e48e5ca authored May 28, 2012 by Hanno Schlichting
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

src/ZPublisher/HTTPRequest.py src/ZPublisher/HTTPRequest.py +2 -2

No files found.
--- a/src/ZPublisher/HTTPRequest.py
+++ b/src/ZPublisher/HTTPRequest.py
@@ -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 (
+            https_environ = environ.get('HTTPS', False)
-                environ['HTTPS'] == "on" or environ['HTTPS'] == "ON"):
+            if https_environ and https_environ in ('on', 'ON', '1'):
                protocol = 'https'
            elif ('SERVER_PORT_SECURE' in environ and
                environ['SERVER_PORT_SECURE'] == "1"):