[Python-checkins] python/dist/src/Lib CGIHTTPServer.py, 1.32, 1.32.6.1

[gvanrossum at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11439

Modified Files:
      Tag: release23-maint
	CGIHTTPServer.py 
Log Message:
Backporting to 2.3:
Fix for SF 777848.
I've been bitten by this myself in the past half year.
I hope this fix is right.


Index: CGIHTTPServer.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/CGIHTTPServer.py,v
retrieving revision 1.32
retrieving revision 1.32.6.1
diff -C2 -d -r1.32 -r1.32.6.1
*** CGIHTTPServer.py	14 Jul 2003 06:56:32 -0000	1.32
--- CGIHTTPServer.py	20 Mar 2004 22:22:31 -0000	1.32.6.1
***************
*** 178,187 ****
              env['HTTP_COOKIE'] = ', '.join(co)
          # XXX Other HTTP_* headers
!         if not self.have_fork:
!             # Since we're setting the env in the parent, provide empty
!             # values to override previously set values
!             for k in ('QUERY_STRING', 'REMOTE_HOST', 'CONTENT_LENGTH',
!                       'HTTP_USER_AGENT', 'HTTP_COOKIE'):
!                 env.setdefault(k, "")
          os.environ.update(env)
  
--- 178,186 ----
              env['HTTP_COOKIE'] = ', '.join(co)
          # XXX Other HTTP_* headers
!         # Since we're setting the env in the parent, provide empty
!         # values to override previously set values
!         for k in ('QUERY_STRING', 'REMOTE_HOST', 'CONTENT_LENGTH',
!                   'HTTP_USER_AGENT', 'HTTP_COOKIE'):
!             env.setdefault(k, "")
          os.environ.update(env)