diff options
| author | Georg Brandl <georg@python.org> | 2010-08-01 19:07:28 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-01 19:07:28 (GMT) |
| commit | caa78fee030f5a832141570ff2b56367059a3ce9 (patch) | |
| tree | 06d1d6be17495d5d5de343c16a87e4f203ec33ac /Lib/http/server.py | |
| parent | 44c58236d748b3301b0bc6057f8a93d8eeb2ab3c (diff) | |
| download | cpython-caa78fee030f5a832141570ff2b56367059a3ce9.zip cpython-caa78fee030f5a832141570ff2b56367059a3ce9.tar.gz cpython-caa78fee030f5a832141570ff2b56367059a3ce9.tar.bz2 | |
Merged revisions 83371,83390 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r83371 | georg.brandl | 2010-07-31 23:54:24 +0200 (Sa, 31 Jul 2010) | 1 line
#8292: Fix three instances of truth tests on return values of filter() (which is always true in Python 3).
........
r83390 | georg.brandl | 2010-08-01 10:07:49 +0200 (So, 01 Aug 2010) | 1 line
#8230: make Lib/test/sortperf.py run on Python 3.
........
Diffstat (limited to 'Lib/http/server.py')
| -rw-r--r-- | Lib/http/server.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/http/server.py b/Lib/http/server.py index f6f788f..930831c 100644 --- a/Lib/http/server.py +++ b/Lib/http/server.py @@ -1015,8 +1015,9 @@ class CGIHTTPRequestHandler(SimpleHTTPRequestHandler): if ua: env['HTTP_USER_AGENT'] = ua co = filter(None, self.headers.get_all('cookie', [])) - if co: - env['HTTP_COOKIE'] = ', '.join(co) + cookie_str = ', '.join(co) + if cookie_str: + env['HTTP_COOKIE'] = cookie_str # XXX Other HTTP_* headers # Since we're setting the env in the parent, provide empty # values to override previously set values |