Merge pull request #2233 from rayluo/patch-1

Better https detection
2019-07-23 00:28:17 -07:00
parent 0557fe9c58 8faa5e2a82
commit 2c364c2079
1 changed files with 1 additions and 1 deletions
@@ -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 = request.env.get('wsgi_url_scheme', 'http').lower() if request else 'http'
+        scheme = 'https' if request and request.is_https 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)