summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Kline <samkline@gmail.com>2012-07-07 16:47:41 -0300
committerMarcel Hellkamp <marc@gsites.de>2012-07-08 11:43:18 +0200
commit566239e883a5149225c23f411f279bacf25c1527 (patch)
tree92f2fe91e9257c0b1cf5f9b1db8a27667dd4c45b
parentdececb1bf032a1ee96e3a1365e8d3b4e261e97c7 (diff)
downloadbottle-566239e883a5149225c23f411f279bacf25c1527.tar.gz
Respect HTTP_X_FORWARDED_PROTO (if present) so we don't break HTTPS when redirecting
-rw-r--r--bottle.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bottle.py b/bottle.py
index 6c236b9..871bd2e 100644
--- a/bottle.py
+++ b/bottle.py
@@ -1118,7 +1118,7 @@ class BaseRequest(object):
but the fragment is always empty because it is not visible to the
server. '''
env = self.environ
- http = env.get('wsgi.url_scheme', 'http')
+ http = env.get('HTTP_X_FORWARDED_PROTO') or env.get('wsgi.url_scheme', 'http')
host = env.get('HTTP_X_FORWARDED_HOST') or env.get('HTTP_HOST')
if not host:
# HTTP 1.1 requires a Host-header. This is for HTTP/1.0 clients.