dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged with online branch

Browse Source
This commit is contained in:
Massimo DiPierro
2012-06-06 11:19:42 -05:00
parent a51c0d119d
commit 0b70f7fa48
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-06-06 11:06:38) dev Version 2.00.0 (2012-06-06 11:19:38) dev
applications/admin/controllers/appadmin.py
+1 -2
View File
@@ -25,8 +25,7 @@ try:
except: except:
hosts = (http_host, ) hosts = (http_host, )
if request.env.http_x_forwarded_for or request.env.wsgi_url_scheme\ if request.env.http_x_forwarded_for or request.is_https:
in ['https', 'HTTPS']:
session.secure() session.secure()
elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1"): elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1"):
raise HTTP(200, T('appadmin is disabled because insecure channel')) raise HTTP(200, T('appadmin is disabled because insecure channel'))
applications/examples/controllers/appadmin.py
+1 -2
View File
@@ -25,8 +25,7 @@ try:
except: except:
hosts = (http_host, ) hosts = (http_host, )
if request.env.http_x_forwarded_for or request.env.wsgi_url_scheme\ if request.env.http_x_forwarded_for or request.is_https:
in ['https', 'HTTPS']:
session.secure() session.secure()
elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1"): elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1"):
raise HTTP(200, T('appadmin is disabled because insecure channel')) raise HTTP(200, T('appadmin is disabled because insecure channel'))