diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2016-06-02 19:57:53 -0600 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2016-06-03 14:13:09 -0600 |
| commit | 8e40b0c00db6a5edf0e4872b2c876caca5421519 (patch) | |
| tree | 10f39ab31794c27e6f4960fc55b96e6003410870 | |
| parent | a6d29763cb600e358532ecf291a02f8ffd01e5c7 (diff) | |
| download | waitress-8e40b0c00db6a5edf0e4872b2c876caca5421519.tar.gz | |
Update get_server_hostname to support IPv6
| -rw-r--r-- | waitress/server.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/waitress/server.py b/waitress/server.py index 4aa5580..443f081 100644 --- a/waitress/server.py +++ b/waitress/server.py @@ -152,7 +152,7 @@ class BaseWSGIServer(logging_dispatcher, object): self.set_reuse_addr() self.bind_server_socket() self.effective_host, self.effective_port = self.getsockname() - self.server_name = self.get_server_name(self.adj.host) + self.server_name = self.get_server_name(self.effective_host) self.active_channels = {} if _start: self.accept_connections() @@ -166,12 +166,13 @@ class BaseWSGIServer(logging_dispatcher, object): server_name = str(ip) else: server_name = str(self.socketmod.gethostname()) + # Convert to a host name if necessary. for c in server_name: if c != '.' and not c.isdigit(): return server_name try: - if server_name == '0.0.0.0': + if server_name == '0.0.0.0' or server_name == '::': return 'localhost' server_name = self.socketmod.gethostbyaddr(server_name)[0] except socket.error: # pragma: no cover |