diff --git a/gluon/packages/dal b/gluon/packages/dal
index 54191338..8e544905 160000
--- a/gluon/packages/dal
+++ b/gluon/packages/dal
@@ -1 +1 @@
-Subproject commit 541913385cb731f2802b3f1b6f744093bb3abdf3
+Subproject commit 8e544905d3304c587f52cdedd3948cf586c4f7ae
diff --git a/gluon/rewrite.py b/gluon/rewrite.py
index 48c1535b..526e2a10 100644
--- a/gluon/rewrite.py
+++ b/gluon/rewrite.py
@@ -204,7 +204,7 @@ def url_out(request, environ, application, controller, function,
     if host is True or (host is None and (scheme or port is not None)):
         host = request.env.http_host
     if not scheme or scheme is True:
-        scheme = 'https' if request and request.is_https else 'http'
+        scheme = request.env.get('wsgi_url_scheme', 'http').lower() if request else 'http'
     if host:
         host_port = host if not port else host.split(':', 1)[0] + ':%s' % port
         url = '%s://%s%s' % (scheme, host_port, url)