summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2010-03-01 21:56:18 (GMT)
committerBarry Warsaw <barry@python.org>2010-03-01 21:56:18 (GMT)
commit0712921ef993159a0e37cf986843a91833073ca5 (patch)
treee5ffa730f370fab3259fcafdd7a057a6e4551a2a
parent6fa06d42f3bc0f5a99be1b428652f8ddb7203f2d (diff)
downloadcpython-0712921ef993159a0e37cf986843a91833073ca5.zip
cpython-0712921ef993159a0e37cf986843a91833073ca5.tar.gz
cpython-0712921ef993159a0e37cf986843a91833073ca5.tar.bz2
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.
-rw-r--r--Lib/wsgiref/handlers.py4
-rw-r--r--Misc/NEWS3
2 files changed, 7 insertions, 0 deletions
diff --git a/Lib/wsgiref/handlers.py b/Lib/wsgiref/handlers.py
index e082823..8a78eec 100644
--- a/Lib/wsgiref/handlers.py
+++ b/Lib/wsgiref/handlers.py
@@ -465,6 +465,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 55700b7..68619ea 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -94,6 +94,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