merged with online branch

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

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'))

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'))