diff -r 7c8101b5ceb1 -r de7256c82fad mercurial/hgweb/server.py --- a/mercurial/hgweb/server.py Fri Mar 14 22:12:50 2008 +0100 +++ b/mercurial/hgweb/server.py Mon Mar 10 19:25:34 2008 +0000 @@ -253,13 +253,6 @@ return hgwebobj self.application = make_handler() - addr = address - if addr in ('', '::'): - addr = socket.gethostname() - - self.addr, self.port = addr, port - self.prefix = prefix - if ssl_cert: try: from OpenSSL import SSL @@ -273,6 +266,15 @@ self.server_bind() self.server_activate() + self.addr, self.port = self.socket.getsockname()[0:2] + self.prefix = prefix + + self.fqaddr = socket.getfqdn(address) + try: + socket.getaddrbyhost(self.fqaddr) + except: + fqaddr = address + class IPv6HTTPServer(MercurialHTTPServer): address_family = getattr(socket, 'AF_INET6', None) @@ -292,4 +294,5 @@ else: return MercurialHTTPServer((address, port), handler) except socket.error, inst: - raise util.Abort(_('cannot start server: %s') % inst.args[1]) + raise util.Abort(_("cannot start server at '%s:%d': %s") + % (address, port, inst.args[1]))