--- http_request.orig.py	2004-01-21 22:59:20.000000000 -0600
+++ http_request.py	2004-01-21 23:04:04.000000000 -0600
@@ -212,8 +212,11 @@
         """
         server_name = self.environ["SERVER_NAME"].strip()
         server_port = self.environ.get("SERVER_PORT")
+        http_host = self.environ.get("HTTP_HOST")
 
-        if (not server_port or
+        if http_host:
+            return http_host
+        elif (not server_port or
             (self.scheme == "http" and server_port == "80") or
             (self.scheme == "https" and server_port == "443")):
             return server_name