[Zope-Checkins] CVS: Zope3/lib/python/Zope/Publisher/HTTP - HTTPRequest.py:1.1.2.6

[Shane Hathaway]

Update of /cvs-repository/Zope3/lib/python/Zope/Publisher/HTTP
In directory cvs.zope.org:/tmp/cvs-serv25924/HTTP

Modified Files:
      Tag: Zope-3x-branch
	HTTPRequest.py 
Log Message:
Fixed NameError


=== Zope3/lib/python/Zope/Publisher/HTTP/HTTPRequest.py 1.1.2.5 => 1.1.2.6 ===
 
     def _deduceServerURL(self):
-        have_env = self.environ.has_key
+        environ = self.environ
+        have_env = environ.has_key
         if have_env('HTTPS') and (
             environ['HTTPS'] == "on" or environ['HTTPS'] == "ON"):
             protocol = 'https'
@@ -205,8 +206,8 @@
             #         port=s_port
 
         else:
-            hostname = self.environ.get('SERVER_NAME', '').strip()
-            port = self.environ.get('SERVER_PORT', '')
+            hostname = environ.get('SERVER_NAME', '').strip()
+            port = environ.get('SERVER_PORT', '')
         self.setServerURL(protocol=protocol, hostname=hostname, port=port)
         return self.SERVER_URL