Log message for revision 126517:
Merge c126516 from 2.13 branch
Changed:
U Zope/trunk/src/ZPublisher/HTTPRequest.py
-=-
Modified: Zope/trunk/src/ZPublisher/HTTPRequest.py
===================================================================
--- Zope/trunk/src/ZPublisher/HTTPRequest.py 2012-05-28 13:29:31 UTC (rev
126516)
+++ Zope/trunk/src/ZPublisher/HTTPRequest.py 2012-05-28 13:30:50 UTC (rev
126517)
@@ -381,8 +381,8 @@
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"):
_______________________________________________
Zope-Checkins maillist - Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins
