1.1 --- a/WebStack/BaseHTTPRequestHandler.py Mon Apr 11 16:06:00 2005 +0000
1.2 +++ b/WebStack/BaseHTTPRequestHandler.py Mon Apr 11 17:28:14 2005 +0000
1.3 @@ -89,6 +89,20 @@
1.4 self.trans.end_headers()
1.5 self.trans.wfile.write(content)
1.6
1.7 + # Server-related methods.
1.8 +
1.9 + def get_server_name(self):
1.10 +
1.11 + "Returns the server name."
1.12 +
1.13 + return self.trans.client_address[0]
1.14 +
1.15 + def get_server_port(self):
1.16 +
1.17 + "Returns the server port as a string."
1.18 +
1.19 + return str(self.trans.client_address[1])
1.20 +
1.21 # Request-related methods.
1.22
1.23 def get_request_stream(self):
2.1 --- a/WebStack/CGI.py Mon Apr 11 16:06:00 2005 +0000
2.2 +++ b/WebStack/CGI.py Mon Apr 11 17:28:14 2005 +0000
2.3 @@ -85,6 +85,20 @@
2.4 self.content.seek(0)
2.5 self.output.write(self.content.read())
2.6
2.7 + # Server-related methods.
2.8 +
2.9 + def get_server_name(self):
2.10 +
2.11 + "Returns the server name."
2.12 +
2.13 + return self.env.get("SERVER_NAME")
2.14 +
2.15 + def get_server_port(self):
2.16 +
2.17 + "Returns the server port as a string."
2.18 +
2.19 + return self.env.get("SERVER_PORT")
2.20 +
2.21 # Request-related methods.
2.22
2.23 def get_request_stream(self):
3.1 --- a/WebStack/Generic.py Mon Apr 11 16:06:00 2005 +0000
3.2 +++ b/WebStack/Generic.py Mon Apr 11 17:28:14 2005 +0000
3.3 @@ -230,6 +230,20 @@
3.4 else:
3.5 return [value]
3.6
3.7 + # Server-related methods.
3.8 +
3.9 + def get_server_name(self):
3.10 +
3.11 + "Returns the server name."
3.12 +
3.13 + raise NotImplementedError, "get_server_name"
3.14 +
3.15 + def get_server_port(self):
3.16 +
3.17 + "Returns the server port as a string."
3.18 +
3.19 + raise NotImplementedError, "get_server_port"
3.20 +
3.21 # Request-related methods.
3.22
3.23 def get_request_stream(self):
4.1 --- a/WebStack/JavaServlet.py Mon Apr 11 16:06:00 2005 +0000
4.2 +++ b/WebStack/JavaServlet.py Mon Apr 11 17:28:14 2005 +0000
4.3 @@ -91,6 +91,20 @@
4.4
4.5 self.get_response_stream().close()
4.6
4.7 + # Server-related methods.
4.8 +
4.9 + def get_server_name(self):
4.10 +
4.11 + "Returns the server name."
4.12 +
4.13 + return self.request.getServerName()
4.14 +
4.15 + def get_server_port(self):
4.16 +
4.17 + "Returns the server port as a string."
4.18 +
4.19 + return str(self.request.getServerPort())
4.20 +
4.21 # Request-related methods.
4.22
4.23 def get_request_stream(self):
5.1 --- a/WebStack/ModPython.py Mon Apr 11 16:06:00 2005 +0000
5.2 +++ b/WebStack/ModPython.py Mon Apr 11 17:28:14 2005 +0000
5.3 @@ -70,6 +70,20 @@
5.4 if self.session_store is not None:
5.5 self.session_store.close()
5.6
5.7 + # Server-related methods.
5.8 +
5.9 + def get_server_name(self):
5.10 +
5.11 + "Returns the server name."
5.12 +
5.13 + return self.trans.connection.local_addr[0]
5.14 +
5.15 + def get_server_port(self):
5.16 +
5.17 + "Returns the server port as a string."
5.18 +
5.19 + return str(self.trans.connection.local_addr[1])
5.20 +
5.21 # Request-related methods.
5.22
5.23 def get_request_stream(self):
6.1 --- a/WebStack/Twisted.py Mon Apr 11 16:06:00 2005 +0000
6.2 +++ b/WebStack/Twisted.py Mon Apr 11 17:28:14 2005 +0000
6.3 @@ -42,6 +42,20 @@
6.4 if self.session_store is not None:
6.5 self.session_store.close()
6.6
6.7 + # Server-related methods.
6.8 +
6.9 + def get_server_name(self):
6.10 +
6.11 + "Returns the server name."
6.12 +
6.13 + return self.trans.getRequestHostname()
6.14 +
6.15 + def get_server_port(self):
6.16 +
6.17 + "Returns the server port as a string."
6.18 +
6.19 + return self.trans.getHost()[2]
6.20 +
6.21 # Request-related methods.
6.22
6.23 def get_request_stream(self):
7.1 --- a/WebStack/WSGI.py Mon Apr 11 16:06:00 2005 +0000
7.2 +++ b/WebStack/WSGI.py Mon Apr 11 17:28:14 2005 +0000
7.3 @@ -88,6 +88,20 @@
7.4 self.content.seek(0)
7.5 return self.content.read()
7.6
7.7 + # Server-related methods.
7.8 +
7.9 + def get_server_name(self):
7.10 +
7.11 + "Returns the server name."
7.12 +
7.13 + return self.env.get("SERVER_NAME")
7.14 +
7.15 + def get_server_port(self):
7.16 +
7.17 + "Returns the server port as a string."
7.18 +
7.19 + return self.env.get("SERVER_PORT")
7.20 +
7.21 # Request-related methods.
7.22
7.23 def get_request_stream(self):
8.1 --- a/WebStack/Webware.py Mon Apr 11 16:06:00 2005 +0000
8.2 +++ b/WebStack/Webware.py Mon Apr 11 17:28:14 2005 +0000
8.3 @@ -26,6 +26,24 @@
8.4 self.user = None
8.5 self.path_info = None
8.6
8.7 + # Server-related methods.
8.8 +
8.9 + def get_server_name(self):
8.10 +
8.11 + "Returns the server name."
8.12 +
8.13 + return self.trans.request().serverURL().split("/")[0].split(":")[0]
8.14 +
8.15 + def get_server_port(self):
8.16 +
8.17 + "Returns the server port as a string."
8.18 +
8.19 + host_and_port = self.trans.request().serverURL().split("/")[0].split(":")
8.20 + if len(host_and_port) > 1:
8.21 + return host_and_port[1]
8.22 + else:
8.23 + return "80"
8.24 +
8.25 # Request-related methods.
8.26
8.27 def get_request_stream(self):
9.1 --- a/WebStack/Zope.py Mon Apr 11 16:06:00 2005 +0000
9.2 +++ b/WebStack/Zope.py Mon Apr 11 17:28:14 2005 +0000
9.3 @@ -40,6 +40,20 @@
9.4 self.user = None
9.5 self.path_info = None
9.6
9.7 + # Server-related methods.
9.8 +
9.9 + def get_server_name(self):
9.10 +
9.11 + "Returns the server name."
9.12 +
9.13 + return self.request.environ.get("SERVER_NAME")
9.14 +
9.15 + def get_server_port(self):
9.16 +
9.17 + "Returns the server port as a string."
9.18 +
9.19 + return self.request.environ.get("SERVER_PORT")
9.20 +
9.21 # Request-related methods.
9.22
9.23 def get_request_stream(self):