summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Bicking <ianb@colorstudy.com>2010-09-01 18:37:58 -0500
committerIan Bicking <ianb@colorstudy.com>2010-09-01 18:37:58 -0500
commitc36883f52e019c4d609f3a787f37b74880a0fdf4 (patch)
treed5a72d7f0a7cb6600856b8a48152b25003a81721
parent459cadcc2fdaee9ead583510b27af3e0738f8941 (diff)
downloadpaste-c36883f52e019c4d609f3a787f37b74880a0fdf4.tar.gz
Use X-Forwarded-For in translogger: http://trac.pythonpaste.org/pythonpaste/ticket/412 -- also news for last commits
-rw-r--r--docs/news.txt7
-rw-r--r--paste/translogger.py7
2 files changed, 13 insertions, 1 deletions
diff --git a/docs/news.txt b/docs/news.txt
index 5bacc24..f2899c5 100644
--- a/docs/news.txt
+++ b/docs/news.txt
@@ -6,6 +6,13 @@ News
tip
---
+* Won't install ``tests/`` directory (also caused installation
+ problems on some Mac systems).
+
+* Fixed problem with gzip middleware and zero-length responses.
+
+* Use ``X-Forwarded-For`` header in :mod:`paste.translogger`
+
* Fixed problems with mimeparse code
* Fixed some corner cases with CGI scripts
diff --git a/paste/translogger.py b/paste/translogger.py
index 40ab187..47de2d3 100644
--- a/paste/translogger.py
+++ b/paste/translogger.py
@@ -78,8 +78,13 @@ class TransLogger(object):
offset = "+%0.4d" % (offset)
elif offset < 0:
offset = "%0.4d" % (offset)
+ remote_addr = '-'
+ if environ.get('HTTP_X_FORWARDED_FOR'):
+ remote_addr = environ['HTTP_X_FORWARDED_FOR']
+ elif environ.get('REMOTE_ADDR'):
+ remote_addr = environ['REMOTE_ADDR']
d = {
- 'REMOTE_ADDR': environ.get('REMOTE_ADDR') or '-',
+ 'REMOTE_ADDR': remote_addr,
'REMOTE_USER': environ.get('REMOTE_USER') or '-',
'REQUEST_METHOD': method,
'REQUEST_URI': req_uri,