mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 13:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.4 (#23801)

Browse source
This commit is contained in:
Benjamin Peterson 2015-03-29 16:45:19 -04:00
commit 0deefd5a94
3 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/cgi.py
View file

@ -699,8 +699,13 @@ class FieldStorage:
raise ValueError("%s should return bytes, got %s" \
% (self.fp, type(first_line).__name__))
self.bytes_read += len(first_line)
# first line holds boundary ; ignore it, or check that
# b"--" + ib == first_line.strip() ?
# Ensure that we consume the file until we've hit our inner boundary
while (first_line.strip() != (b"--" + self.innerboundary) and
first_line):
first_line = self.fp.readline()
self.bytes_read += len(first_line)
while True:
parser = FeedParser()
hdr_text = b""