Apply the change suggested by PJE for issue 7250. Unfortunately, we couldn't

come up with a unit test. :(

diff --git a/Lib/wsgiref/handlers.py b/Lib/wsgiref/handlers.py
index 173e34c136e89c9c148bd8270d41dc339a616e9b..5cfc28af6f9660b16efe8f076a2b1cad4be26a70 100644 (file)
--- a/Lib/wsgiref/handlers.py
+++ b/Lib/wsgiref/handlers.py
@@ -468,6 +468,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 a9189371809d19394655f9595f6889568a5857ae..a7b724fb0230e272968d8b5e9aa00ce67caf6f74 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -74,6 +74,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