Merge remote-tracking branch 'origin/master'

2012-06-06 11:16:28 -05:00
parent fb7f42f4ba 29b8979bdb
commit 0d29ba9314
1 changed files with 1 additions and 2 deletions
@@ -25,8 +25,7 @@ try:
 except:
    hosts = (http_host, )

-if request.env.http_x_forwarded_for or request.env.wsgi_url_scheme\
-     in ['https', 'HTTPS']:
+if request.env.http_x_forwarded_for or request.is_https:
    session.secure()
 elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1"):
    raise HTTP(200, T('appadmin is disabled because insecure channel'))