use self.headers for cases where no headers were passed in

diff --git a/tornado/httpserver.py b/tornado/httpserver.py
index 894f0593da5337163ab74b07de308047703f3ee9..742cfc87205c58666e32048603c66f5a6f12950c 100644 (file)
--- a/tornado/httpserver.py
+++ b/tornado/httpserver.py
@@ -360,13 +360,13 @@ class HTTPRequest(object):
         self.body = body or ""
         if connection and connection.xheaders:
             # Squid uses X-Forwarded-For, others use X-Real-Ip
-            self.remote_ip = headers.get(
-                "X-Real-Ip", headers.get("X-Forwarded-For", remote_ip))
-            self.protocol = headers.get("X-Scheme", protocol) or "http"
+            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"
         else:
             self.remote_ip = remote_ip
             self.protocol = protocol or "http"
-        self.host = host or headers.get("Host") or "127.0.0.1"
+        self.host = host or self.headers.get("Host") or "127.0.0.1"
         self.files = files or {}
         self.connection = connection
         self._start_time = time.time()