This patch causes CGIHTTPServer to update os.environ
regardless of how it tries to handle calls (fork,
popen*, etc.).

I discovered this when trying to run Quixote through
CGIHTTPServer and getting errors reported by Quixote
saying that the SCRIPT_NAME environment variable was
not being updated.  I noticed that if self.has_fork was
true, then os.environ was never explicitly updated;
os.execve() has the env dict passed to it but I guess
that is not enough or OS X's os.execve() is broken.

So this patch just calls os.environ.update(env) after
the last change to the env dict but before the method
has decided how it is going to deal with the call.  It
also removes the now extraneous calls previously used.

Logged In: YES 
user_id=6380

Thanks! Applied to Python 2.3 in CVS. Somebody can backport
this to 2.2.2.

Logged In: YES 
user_id=80475

Backported to 2.2.2.