Rooba
/
tornado
mirror of https://github.com/tornadoweb/tornado.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support X-Forwarded-Proto in addition to X-Scheme

This commit is contained in:
Ben Darnell 2010-11-08 10:54:50 -08:00
parent 7ed8fbe136
commit ee55403cd4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tornado/httpserver.py
View File

@ -437,7 +437,11 @@ class HTTPRequest(object):
# Squid uses X-Forwarded-For, others use X-Real-Ip
self.remote_ip = self.headers.get(
"X-Real-Ip", self.headers.get("X-Forwarded-For", remote_ip))
self.protocol = self.headers.get("X-Scheme", protocol) or "http"
# AWS uses X-Forwarded-Proto
self.protocol = self.headers.get(
"X-Scheme", self.headers.get("X-Forwarded-Proto", protocol))
if self.protocol not in ("http", "https"):
self.protocol = "http"
else:
self.remote_ip = remote_ip
self.protocol = protocol or "http"