From b193826078c72e509549a607a7e9662549ab82a4 Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Mon, 1 Mar 2010 21:53:00 +0000 Subject: [PATCH] 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 f0cc39803a7..a87c32ce851 100644 --- a/Lib/wsgiref/handlers.py +++ b/Lib/wsgiref/handlers.py @@ -431,6 +431,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 0ae3867a586..f2c9bc2146a 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -262,6 +262,9 @@ C-API 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