Commit 4a5449cc authored by Jens Vagelpohl's avatar Jens Vagelpohl

- LP #143533: Instead of showing "0.0.0.0" as server name when no

  specific listening IP is configured for the HTTP server, do a
  socket lookup to show the current server's fully qualified name.
parent 2ae5fafe
...@@ -11,6 +11,10 @@ http://docs.zope.org/zope2/releases/. ...@@ -11,6 +11,10 @@ http://docs.zope.org/zope2/releases/.
Bugs Fixed Bugs Fixed
++++++++++ ++++++++++
- LP #143533: Instead of showing "0.0.0.0" as server name when no
specific listening IP is configured for the HTTP server, do a
socket lookup to show the current server's fully qualified name.
- LP #143722: Added missing permission to ObjectManager.manage_hasId, - LP #143722: Added missing permission to ObjectManager.manage_hasId,
which prevented renaming files and folders via FTP. which prevented renaming files and folders via FTP.
......
...@@ -447,6 +447,12 @@ class zhttp_server(http_server): ...@@ -447,6 +447,12 @@ class zhttp_server(http_server):
self.shutup=1 self.shutup=1
self.fast_listen = fast_listen self.fast_listen = fast_listen
http_server.__init__(self, ip, port, resolver, logger_object) http_server.__init__(self, ip, port, resolver, logger_object)
if self.server_name == '0.0.0.0':
# Workaround to set a more descriptive server_name
try:
self.server_name = socket.getfqdn()
except socket.error:
pass
self.shutup=0 self.shutup=0
self.log_info('%s server started at %s\n' self.log_info('%s server started at %s\n'
'\tHostname: %s\n\tPort: %d' % ( '\tHostname: %s\n\tPort: %d' % (
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment