Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

backport r60116 - fix zipfile to work with archives having file 

headers beyond the signed 2**31 byte boundary.
This commit is contained in:
Gregory P. Smith 2008-01-19 23:16:01 +00:00
parent c223c6cb41
commit 1cc98af8a1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/zipfile.py
View File

@ -32,9 +32,9 @@ ZIP_DEFLATED = 8
# Other ZIP compression methods not supported # Other ZIP compression methods not supported
# Here are some struct module formats for reading headers # Here are some struct module formats for reading headers
structEndArchive = "<4s4H2lH" # 9 items, end of archive, 22 bytes structEndArchive = "<4s4H2LH" # 9 items, end of archive, 22 bytes
stringEndArchive = "PK\005\006" # magic number for end of archive record stringEndArchive = "PK\005\006" # magic number for end of archive record
structCentralDir = "<4s4B4HlLL5HLl"# 19 items, central directory, 46 bytes structCentralDir = "<4s4B4HlLL5HLL"# 19 items, central directory, 46 bytes
stringCentralDir = "PK\001\002" # magic number for central directory stringCentralDir = "PK\001\002" # magic number for central directory
structFileHeader = "<4s2B4HlLL2H" # 12 items, file header record, 30 bytes structFileHeader = "<4s2B4HlLL2H" # 12 items, file header record, 30 bytes
stringFileHeader = "PK\003\004" # magic number for file header stringFileHeader = "PK\003\004" # magic number for file header

3
Misc/NEWS
View File

@ -53,6 +53,9 @@ Core and builtins
Library Library
------- -------
- #1189216: Fix the zipfile module to work on archives with headers
past the 2**31 byte boundary.
- Issue #1336: fix a race condition in subprocess.Popen if the garbage - Issue #1336: fix a race condition in subprocess.Popen if the garbage
collector kicked in at the wrong time that would cause the process collector kicked in at the wrong time that would cause the process
to hang when the child wrote to stderr. to hang when the child wrote to stderr.