From f8505e69f864e946f268f303f6d8a4025c79679d Mon Sep 17 00:00:00 2001
From: ianb <devnull@localhost>
Date: Tue, 30 Oct 2007 21:25:52 +0000
Subject: Don't overwrite X-Forwarded-For

---
 paste/proxy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'paste/proxy.py')

diff --git a/paste/proxy.py b/paste/proxy.py
index 11b4cef..8972f58 100644
--- a/paste/proxy.py
+++ b/paste/proxy.py
@@ -194,7 +194,7 @@ class TransparentProxy(object):
                 key = key[5:].lower().replace('_', '-')
                 headers[key] = value
         headers['host'] = host
-        if 'REMOTE_ADDR' in environ:
+        if 'REMOTE_ADDR' in environ and 'HTTP_X_FORWARDED_FOR' not in environ:
             headers['x-forwarded-for'] = environ['REMOTE_ADDR']
         if environ.get('CONTENT_TYPE'):
             headers['content-type'] = environ['CONTENT_TYPE']
-- 
cgit v1.2.1