--- lib/python/ZServer/medusa/http_server.py-   2007-05-23 14:00:30.000000000 +0000
+++ lib/python/ZServer/medusa/http_server.py    2007-05-23 14:01:40.000000000 +0000
@@ -270,6 +270,11 @@
                tz_for_log
 
     def log (self, bytes):
+        addr=None
+        if self.get_header('x-forwarded-for'):
+            addr = string.split(self.get_header('x-forwarded-for'), ", ")[-1]
+        if not addr: addr = self.channel.addr[0]
+
         user_agent=self.get_header('user-agent')
         if not user_agent: user_agent=''
         referer=self.get_header('referer')
@@ -288,7 +293,7 @@
                     name = t[0]
 
         self.channel.server.logger.log (
-            self.channel.addr[0],
+            addr,
             '- %s [%s] "%s" %d %d "%s" "%s"\n' % (
                 name,
                 self.log_date_string (time.time()),