[Python-checkins] r78566 - in python/trunk: Lib/wsgiref/handlers.py Misc/NEWS

Mon Mar 1 22:46:51 CET 2010

Author: barry.warsaw
Date: Mon Mar 1 22:46:51 2010
New Revision: 78566
Log:
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.
Modified:
 python/trunk/Lib/wsgiref/handlers.py
 python/trunk/Misc/NEWS
Modified: python/trunk/Lib/wsgiref/handlers.py
==============================================================================

--- python/trunk/Lib/wsgiref/handlers.py	(original)
+++ python/trunk/Lib/wsgiref/handlers.py	Mon Mar 1 22:46:51 2010
@@ -434,6 +434,10 @@
 """
 
 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__(
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Mon Mar 1 22:46:51 2010
@@ -35,6 +35,9 @@
 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
