From: Ant Zucaro <azucaro@gmail.com>
Date: Wed, 21 Dec 2011 16:13:31 +0000 (-0500)
Subject: Use X-Forwarded-For properly.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0099e872a14dcf668b5ddac1f595e53bb3eb9b94;p=xonotic%2Fxonstat.git

Use X-Forwarded-For properly.
---

diff --git a/xonstat/views/submission.py b/xonstat/views/submission.py
index 46ed1aa..4d969b8 100755
--- a/xonstat/views/submission.py
+++ b/xonstat/views/submission.py
@@ -17,8 +17,10 @@ def get_remote_addr(request):
     """Get the Xonotic server's IP address"""
     if 'X-Server-IP' in request.headers:
         return request.headers['X-Server-IP']
+    elif 'X-Forwarded-For' in request.headers:
+        return request.headers['X-Forwarded-For']
     else:
-        return os.environ.get('HTTP_X_FORWARDED_FOR', request.remote_addr)
+        return request.remote_addr
 
 
 def is_supported_gametype(gametype):