From 0b70f7fa48831a8a042b0f4a76b61427a012762b Mon Sep 17 00:00:00 2001 From: Massimo DiPierro Date: Wed, 6 Jun 2012 11:19:42 -0500 Subject: [PATCH] merged with online branch --- VERSION | 2 +- applications/admin/controllers/appadmin.py | 3 +-- applications/examples/controllers/appadmin.py | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index a0f803c7..a71d48ed 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-06-06 11:06:38) dev +Version 2.00.0 (2012-06-06 11:19:38) dev diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py index 7a2ce1f7..70f66878 100644 --- a/applications/admin/controllers/appadmin.py +++ b/applications/admin/controllers/appadmin.py @@ -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')) diff --git a/applications/examples/controllers/appadmin.py b/applications/examples/controllers/appadmin.py index 7a2ce1f7..70f66878 100644 --- a/applications/examples/controllers/appadmin.py +++ b/applications/examples/controllers/appadmin.py @@ -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'))