From 0bd783228538b761e9b75cea3f42931c2d4ba6c6 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 20 Aug 2002 19:55:06 +0000 Subject: [PATCH] SF patch 595846 by Brett Cannon: Update environ for CGIHTTPServer.py This patch causes CGIHTTPServer to update os.environ regardless of how it tries to handle calls (fork, popen*, etc.). Backport bugfix candidate. --- Lib/CGIHTTPServer.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Lib/CGIHTTPServer.py b/Lib/CGIHTTPServer.py index 0279117c7a..eb1ee198b3 100644 --- a/Lib/CGIHTTPServer.py +++ b/Lib/CGIHTTPServer.py @@ -182,6 +182,7 @@ class CGIHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): for k in ('QUERY_STRING', 'REMOTE_HOST', 'CONTENT_LENGTH', 'HTTP_USER_AGENT', 'HTTP_COOKIE'): env.setdefault(k, "") + so.environ.update(env) self.send_response(200, "Script output follows") @@ -221,7 +222,6 @@ class CGIHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): popenx = os.popen3 else: popenx = os.popen2 - os.environ.update(env) cmdline = scriptfile if self.is_python(scriptfile): interp = sys.executable @@ -259,7 +259,6 @@ class CGIHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): else: # Other O.S. -- execute script in this process - os.environ.update(env) save_argv = sys.argv save_stdin = sys.stdin save_stdout = sys.stdout -- 2.40.0