Merge c126516 from 2.13 branch

zopefoundation · May 28, 2012 · 4e48e5c · 4e48e5c
1 parent f6dbdda
commit 4e48e5c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/ZPublisher/HTTPRequest.py b/src/ZPublisher/HTTPRequest.py
@@ -381,8 +381,8 @@ def __init__(self, stdin, environ, response, clean=0):
         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"):