From: Bret Taylor <btaylor@btaylor-ubuntu.(none)>
Date: Tue, 24 Nov 2009 18:27:38 +0000 (-0800)
Subject: Add support for Squid proxy headers
X-Git-Tag: v1.0.0~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=595ffa1975835c82ef21b4cfd8bc5076c292e828;p=thirdparty%2Ftornado.git

Add support for Squid proxy headers
---

diff --git a/tornado/httpserver.py b/tornado/httpserver.py
index 460f5c8f8..2a765a53f 100644
--- a/tornado/httpserver.py
+++ b/tornado/httpserver.py
@@ -277,7 +277,9 @@ class HTTPRequest(object):
         self.headers = headers or HTTPHeaders()
         self.body = body or ""
         if connection and connection.xheaders:
-            self.remote_ip = headers.get("X-Real-Ip", remote_ip)
+            # 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"
         else:
             self.remote_ip = remote_ip