[Zope-Checkins] CVS: Zope/lib/python/ZPublisher - Test.py:1.40.66.4

[Ken Manheimer]

Update of /cvs-repository/Zope/lib/python/ZPublisher
In directory cvs.zope.org:/tmp/cvs-serv13000

Modified Files:
      Tag: Zope-2_7-branch
	Test.py 
Log Message:
Use passed-in publisher env values, when present - don't just stomp
'em.  Works as before when the values were not passed in, so this
change should be backwards compatable.


=== Zope/lib/python/ZPublisher/Test.py 1.40.66.3 => 1.40.66.4 ===
--- Zope/lib/python/ZPublisher/Test.py:1.40.66.3	Wed Mar 10 13:39:51 2004
+++ Zope/lib/python/ZPublisher/Test.py	Thu Mar 11 20:23:33 2004
@@ -258,19 +258,22 @@
     if script[0]=='+': script='../../lib/python/'+script[1:]
 
     env=e
-    env['SERVER_NAME']='bobo.server'
-    env['SERVER_PORT']='80'
-    env['REQUEST_METHOD']=request_method
-    env['REMOTE_ADDR']='204.183.226.81 '
-    env['REMOTE_HOST']='bobo.remote.host'
-    env['HTTP_USER_AGENT']='Bobo/%s' % __version__
-    env['HTTP_HOST']='127.0.0.1'
-    env['SERVER_SOFTWARE']='Bobo/%s' % __version__
-    env['SERVER_PROTOCOL']='HTTP/1.0 '
-    env['HTTP_ACCEPT']='image/gif, image/x-xbitmap, image/jpeg, */* '
-    env['SERVER_HOSTNAME']='bobo.server.host'
-    env['GATEWAY_INTERFACE']='CGI/1.1 '
-    env['SCRIPT_NAME']=script
+    env['SERVER_NAME'] = env.get('SERVER_NAME', 'bobo.server')
+    env['SERVER_PORT'] = env.get('SERVER_PORT', '80')
+    env['REQUEST_METHOD'] = env.get('REQUEST_METHOD', request_method)
+    env['REMOTE_ADDR'] = env.get('REMOTE_ADDR', '204.183.226.81 ')
+    env['REMOTE_HOST'] = env.get('REMOTE_HOST', 'bobo.remote.host')
+    env['HTTP_USER_AGENT'] = env.get('HTTP_USER_AGENT',
+                                     'Bobo/%s' % __version__)
+    env['HTTP_HOST'] = env.get('HTTP_HOST', 'localhost')
+    env['SERVER_SOFTWARE'] = env.get('SERVER_SOFTWARE',
+                                     'Bobo/%s' % __version__)
+    env['SERVER_PROTOCOL'] = env.get('SERVER_PROTOCOL', 'HTTP/1.0 ')
+    env['HTTP_ACCEPT'] = env.get('HTTP_ACCEPT',
+                               'image/gif, image/x-xbitmap, image/jpeg, */* ')
+    env['SERVER_HOSTNAME'] = env.get('SERVER_HOSTNAME', 'bobo.server.host')
+    env['GATEWAY_INTERFACE'] = env.get('GATEWAY_INTERFACE', 'CGI/1.1 ')
+    env['SCRIPT_NAME'] = env.get('SCRIPT_NAME', script)
     p=path_info.split('?')
     if   len(p)==1: env['PATH_INFO'] = p[0]
     elif len(p)==2: [env['PATH_INFO'], env['QUERY_STRING']]=p