# HG changeset patch
# User paulb
# Date 1113241401 0
# Node ID 6de0f6fe5959173149a8539a9200e16d6ea4aa9b
# Parent  febbb906d6b7fa56a98541bb8d5d0d6bb87c84e8
[project @ 2005-04-11 17:43:21 by paulb]
Fixed the get_server_name and get_server_port methods to use the server
address.

diff -r febbb906d6b7 -r 6de0f6fe5959 WebStack/BaseHTTPRequestHandler.py
--- a/WebStack/BaseHTTPRequestHandler.py	Mon Apr 11 17:30:25 2005 +0000
+++ b/WebStack/BaseHTTPRequestHandler.py	Mon Apr 11 17:43:21 2005 +0000
@@ -95,13 +95,18 @@
 
         "Returns the server name."
 
-        return self.trans.client_address[0]
+        # As ultimately found in SocketServer.BaseServer via SocketServer.BaseRequestHandler.
+        # NOTE: We assume that any usage of "" can be taken to mean "localhost".
+
+        return self.trans.server.server_address[0] or "localhost"
 
     def get_server_port(self):
 
         "Returns the server port as a string."
 
-        return str(self.trans.client_address[1])
+        # As ultimately found in SocketServer.BaseServer via SocketServer.BaseRequestHandler.
+
+        return str(self.trans.server.server_address[1])
 
     # Request-related methods.