Added logic to make REMOTE_HOST determination fail better in case there is no resolver available.

5561b17b · Amos Latteier · 2215f22a · 5561b17b · 5561b17b
Commit 5561b17b authored May 28, 1999 by Amos Latteier
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

ZServer/HTTPServer.py ZServer/HTTPServer.py +3 -1

lib/python/ZServer/HTTPServer.py lib/python/ZServer/HTTPServer.py +3 -1

No files found.
--- a/ZServer/HTTPServer.py
+++ b/ZServer/HTTPServer.py
@@ -236,7 +236,9 @@ class zhttp_handler:
        try:
            dns_cache=request.channel.server.logger.resolver.cache
            if dns_cache.has_key(env['REMOTE_ADDR']):
-                env['REMOTE_HOST']=dns_cache[env['REMOTE_ADDR']][2]
+                remote_host=dns_cache[env['REMOTE_ADDR']][2]
+                if remote_host is not None:
+                    env['REMOTE_HOST']=remote_host
        except AttributeError:
            pass
        

--- a/lib/python/ZServer/HTTPServer.py
+++ b/lib/python/ZServer/HTTPServer.py
@@ -236,7 +236,9 @@ class zhttp_handler:
        try:
            dns_cache=request.channel.server.logger.resolver.cache
            if dns_cache.has_key(env['REMOTE_ADDR']):
-                env['REMOTE_HOST']=dns_cache[env['REMOTE_ADDR']][2]
+                remote_host=dns_cache[env['REMOTE_ADDR']][2]
+                if remote_host is not None:
+                    env['REMOTE_HOST']=remote_host
        except AttributeError:
            pass