Log message for revision 114752:
- refining the fix for LP #143533
Changed:
U Zope/branches/2.12/doc/CHANGES.rst
U Zope/branches/2.12/src/ZServer/HTTPServer.py
-=-
Modified: Zope/branches/2.12/doc/CHANGES.rst
===================================================================
--- Zope/branches/2.12/doc/CHANGES.rst 2010-07-14 15:11:40 UTC (rev 114751)
+++ Zope/branches/2.12/doc/CHANGES.rst 2010-07-14 15:12:17 UTC (rev 114752)
@@ -14,9 +14,10 @@
- LP #143755: Also catch TypeError when trying to determine an
indexable value for an object in PluginIndexes.common.UnIndex
-- 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 #143533: Instead of showing "0.0.0.0" as the SERVER_NAME
+ request variable 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,
which prevented renaming files and folders via FTP.
Modified: Zope/branches/2.12/src/ZServer/HTTPServer.py
===================================================================
--- Zope/branches/2.12/src/ZServer/HTTPServer.py 2010-07-14 15:11:40 UTC
(rev 114751)
+++ Zope/branches/2.12/src/ZServer/HTTPServer.py 2010-07-14 15:12:17 UTC
(rev 114752)
@@ -185,7 +185,7 @@
env = {}
env['REQUEST_METHOD']=request.command.upper()
env['SERVER_PORT']=str(server.port)
- env['SERVER_NAME']=server.server_name
+ env['SERVER_NAME']=server.request_server_name
env['SERVER_SOFTWARE']=server.SERVER_IDENT
env['SERVER_PROTOCOL']="HTTP/"+request.version
env['channel.creation_time']=request.channel.creation_time
@@ -447,10 +447,12 @@
self.shutup=1
self.fast_listen = fast_listen
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
+ self.request_server_name = self.server_name
+ if self.request_server_name == '0.0.0.0':
+ # Workaround to set a more descriptive server name
+ # for use in the Request SERVER_NAME variable
try:
- self.server_name = socket.getfqdn()
+ self.request_server_name = socket.getfqdn()
except socket.error:
pass
self.shutup=0
_______________________________________________
Zope-Checkins maillist - Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins
