From 08a8fb30b6042e43d680b5b473a884fa987f661c Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Mon, 1 Mar 2010 21:46:51 +0000 Subject: Manually copy patch for bug 7250 from the release26-maint branch. I suck because I did this in the wrong order and couldn't smack svnmerge into submission. --- Lib/wsgiref/handlers.py | 4 ++++ Misc/NEWS | 3 +++ 2 files changed, 7 insertions(+) diff --git a/Lib/wsgiref/handlers.py b/Lib/wsgiref/handlers.py index fcb8e23..a5f7109 100644 --- a/Lib/wsgiref/handlers.py +++ b/Lib/wsgiref/handlers.py @@ -434,6 +434,10 @@ class CGIHandler(BaseCGIHandler): """ wsgi_run_once = True + # Do not allow os.environ to leak between requests in Google App Engine + # and other multi-run CGI use cases. This is not easily testable. + # See http://bugs.python.org/issue7250 + os_environ = {} def __init__(self): BaseCGIHandler.__init__( diff --git a/Misc/NEWS b/Misc/NEWS index 9729699..0564d13 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -35,6 +35,9 @@ Core and Builtins Library ------- +- Issue #7250: Fix info leak of os.environ across multi-run uses of + wsgiref.handlers.CGIHandler. + - Issue #1729305: Fix doctest to handle encode error with "backslashreplace". - Issue #691291: codecs.open() should not convert end of lines on reading and -- cgit v0.12