# HG changeset patch
# User paulb
# Date 1113240494 0
# Node ID 2fa1d52d0c0f5ebcde89868b690d248f827f43c1
# Parent  580566309a373432a137f12e3e130c89200dfbb0
[project @ 2005-04-11 17:28:14 by paulb]
Added get_server_name and get_server_port to the API.

diff -r 580566309a37 -r 2fa1d52d0c0f WebStack/BaseHTTPRequestHandler.py
--- a/WebStack/BaseHTTPRequestHandler.py	Mon Apr 11 16:06:00 2005 +0000
+++ b/WebStack/BaseHTTPRequestHandler.py	Mon Apr 11 17:28:14 2005 +0000
@@ -89,6 +89,20 @@
         self.trans.end_headers()
         self.trans.wfile.write(content)
 
+    # Server-related methods.
+
+    def get_server_name(self):
+
+        "Returns the server name."
+
+        return self.trans.client_address[0]
+
+    def get_server_port(self):
+
+        "Returns the server port as a string."
+
+        return str(self.trans.client_address[1])
+
     # Request-related methods.
 
     def get_request_stream(self):
diff -r 580566309a37 -r 2fa1d52d0c0f WebStack/CGI.py
--- a/WebStack/CGI.py	Mon Apr 11 16:06:00 2005 +0000
+++ b/WebStack/CGI.py	Mon Apr 11 17:28:14 2005 +0000
@@ -85,6 +85,20 @@
         self.content.seek(0)
         self.output.write(self.content.read())
 
+    # Server-related methods.
+
+    def get_server_name(self):
+
+        "Returns the server name."
+
+        return self.env.get("SERVER_NAME")
+
+    def get_server_port(self):
+
+        "Returns the server port as a string."
+
+        return self.env.get("SERVER_PORT")
+
     # Request-related methods.
 
     def get_request_stream(self):
diff -r 580566309a37 -r 2fa1d52d0c0f WebStack/Generic.py
--- a/WebStack/Generic.py	Mon Apr 11 16:06:00 2005 +0000
+++ b/WebStack/Generic.py	Mon Apr 11 17:28:14 2005 +0000
@@ -230,6 +230,20 @@
         else:
             return [value]
 
+    # Server-related methods.
+
+    def get_server_name(self):
+
+        "Returns the server name."
+
+        raise NotImplementedError, "get_server_name"
+
+    def get_server_port(self):
+
+        "Returns the server port as a string."
+
+        raise NotImplementedError, "get_server_port"
+
     # Request-related methods.
 
     def get_request_stream(self):
diff -r 580566309a37 -r 2fa1d52d0c0f WebStack/JavaServlet.py
--- a/WebStack/JavaServlet.py	Mon Apr 11 16:06:00 2005 +0000
+++ b/WebStack/JavaServlet.py	Mon Apr 11 17:28:14 2005 +0000
@@ -91,6 +91,20 @@
 
         self.get_response_stream().close()
 
+    # Server-related methods.
+
+    def get_server_name(self):
+
+        "Returns the server name."
+
+        return self.request.getServerName()
+
+    def get_server_port(self):
+
+        "Returns the server port as a string."
+
+        return str(self.request.getServerPort())
+
     # Request-related methods.
 
     def get_request_stream(self):
diff -r 580566309a37 -r 2fa1d52d0c0f WebStack/ModPython.py
--- a/WebStack/ModPython.py	Mon Apr 11 16:06:00 2005 +0000
+++ b/WebStack/ModPython.py	Mon Apr 11 17:28:14 2005 +0000
@@ -70,6 +70,20 @@
         if self.session_store is not None:
             self.session_store.close()
 
+    # Server-related methods.
+
+    def get_server_name(self):
+
+        "Returns the server name."
+
+        return self.trans.connection.local_addr[0]
+
+    def get_server_port(self):
+
+        "Returns the server port as a string."
+
+        return str(self.trans.connection.local_addr[1])
+
     # Request-related methods.
 
     def get_request_stream(self):
diff -r 580566309a37 -r 2fa1d52d0c0f WebStack/Twisted.py
--- a/WebStack/Twisted.py	Mon Apr 11 16:06:00 2005 +0000
+++ b/WebStack/Twisted.py	Mon Apr 11 17:28:14 2005 +0000
@@ -42,6 +42,20 @@
         if self.session_store is not None:
             self.session_store.close()
 
+    # Server-related methods.
+
+    def get_server_name(self):
+
+        "Returns the server name."
+
+        return self.trans.getRequestHostname()
+
+    def get_server_port(self):
+
+        "Returns the server port as a string."
+
+        return self.trans.getHost()[2]
+
     # Request-related methods.
 
     def get_request_stream(self):
diff -r 580566309a37 -r 2fa1d52d0c0f WebStack/WSGI.py
--- a/WebStack/WSGI.py	Mon Apr 11 16:06:00 2005 +0000
+++ b/WebStack/WSGI.py	Mon Apr 11 17:28:14 2005 +0000
@@ -88,6 +88,20 @@
         self.content.seek(0)
         return self.content.read()
 
+    # Server-related methods.
+
+    def get_server_name(self):
+
+        "Returns the server name."
+
+        return self.env.get("SERVER_NAME")
+
+    def get_server_port(self):
+
+        "Returns the server port as a string."
+
+        return self.env.get("SERVER_PORT")
+
     # Request-related methods.
 
     def get_request_stream(self):
diff -r 580566309a37 -r 2fa1d52d0c0f WebStack/Webware.py
--- a/WebStack/Webware.py	Mon Apr 11 16:06:00 2005 +0000
+++ b/WebStack/Webware.py	Mon Apr 11 17:28:14 2005 +0000
@@ -26,6 +26,24 @@
         self.user = None
         self.path_info = None
 
+    # Server-related methods.
+
+    def get_server_name(self):
+
+        "Returns the server name."
+
+        return self.trans.request().serverURL().split("/")[0].split(":")[0]
+
+    def get_server_port(self):
+
+        "Returns the server port as a string."
+
+        host_and_port = self.trans.request().serverURL().split("/")[0].split(":")
+        if len(host_and_port) > 1:
+            return host_and_port[1]
+        else:
+            return "80"
+
     # Request-related methods.
 
     def get_request_stream(self):
diff -r 580566309a37 -r 2fa1d52d0c0f WebStack/Zope.py
--- a/WebStack/Zope.py	Mon Apr 11 16:06:00 2005 +0000
+++ b/WebStack/Zope.py	Mon Apr 11 17:28:14 2005 +0000
@@ -40,6 +40,20 @@
         self.user = None
         self.path_info = None
 
+    # Server-related methods.
+
+    def get_server_name(self):
+
+        "Returns the server name."
+
+        return self.request.environ.get("SERVER_NAME")
+
+    def get_server_port(self):
+
+        "Returns the server port as a string."
+
+        return self.request.environ.get("SERVER_PORT")
+
     # Request-related methods.
 
     def get_request_stream(self):