Merged
Conversation
Some rogue zip creators fail to set a non-zero local header size in Extra Data causing SharpZLib to reject them, this patch causes the library to tolerate that particular oversight like most other libraries.
When reading a stored file, ZipFile returns a PartialInputStream directly instead of wrapping it with a decompression layer. PartialInputStream handles sharing the underlying stream among multiple threads by calling Seek() before each read. Unlike Microsoft's reference implementation, Mono's FileStream flushes its internal read buffer on every Seek.
…include terminating symbol
…al to thhe entry's ones
Build & File Restructuring
…ZipLib into gitter-badger-gitter-badge # Conflicts: # README.md
… into creker-TarLongNamesFix
…ZipLib into gitter-badger-gitter-badge # Conflicts: # README.md
… McNeight-master # Conflicts: # ICSharpCode.SharpZipLib/Tar/TarHeader.cs # ICSharpCode.SharpZipLib/Tar/TarOutputStream.cs # README.md
…lovanov/SharpZipLib into konstantingolovanov-minizip-problem-fix # Conflicts: # ICSharpCode.SharpZipLib/Zip/ZipEntry.cs
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
…g-master # Conflicts: # ICSharpCode.SharpZipLib/Zip/ZipFile.cs
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
Otherwise we lose the additional accuracy we gain from Unix or NT timestamps. Changing DateTime externally also changes DosTime. DosTime is only mapped to DateTime once on load, if there is no Unix or NT timestamp.
Some rogue zip creators fail to set a non-zero local header size in Extra Data causing SharpZLib to reject them, this patch causes the library to tolerate that particular oversight like most other libraries.
Multiple tweaks and bugfixes
…hempels-master # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
… McNeight-master # Conflicts: # .travis.yml # Build/ICSharpCode.SharpZipLib.nuspec # GlobalAssemblyInfo.cs # ICSharpCode.SharpZipLib.Samples/Samples.sln # ICSharpCode.SharpZipLib.Samples/cs/Cmd_Tar/Tar.cs # ICSharpCode.SharpZipLib.Samples/cs/CreateZipFile/CreateZipFile.cs # ICSharpCode.SharpZipLib.Samples/cs/CreateZipFile/CreateZipFile.csproj # ICSharpCode.SharpZipLib.Samples/cs/FastZip/FastZip.csproj # ICSharpCode.SharpZipLib.Samples/cs/FastZip/Main.cs # ICSharpCode.SharpZipLib.Samples/cs/minibzip2/Main.cs # ICSharpCode.SharpZipLib.Samples/cs/minibzip2/minibzip2.csproj # ICSharpCode.SharpZipLib.Samples/cs/minigzip/Main.cs # ICSharpCode.SharpZipLib.Samples/cs/minigzip/minigzip.csproj # ICSharpCode.SharpZipLib.Samples/cs/sz/sz.csproj # ICSharpCode.SharpZipLib.Samples/cs/tar/Main.cs # ICSharpCode.SharpZipLib.Samples/cs/tar/Tar.csproj # ICSharpCode.SharpZipLib.Samples/cs/tar/tar.cs # ICSharpCode.SharpZipLib.Samples/cs/unzipfile/unzipfile.csproj # ICSharpCode.SharpZipLib.Samples/cs/viewzipfile/viewzipfile.csproj # ICSharpCode.SharpZipLib.Samples/cs/zf/zf.csproj # ICSharpCode.SharpZipLib.Samples/cs/zipfiletest/zipfiletest.csproj # ICSharpCode.SharpZipLib.Samples/vb/CreateZipFile/CreateZipFile.vbproj # ICSharpCode.SharpZipLib.Samples/vb/WpfCreateZipFile/Application.xaml # ICSharpCode.SharpZipLib.Samples/vb/WpfCreateZipFile/My Project/Resources.Designer.vb # ICSharpCode.SharpZipLib.Samples/vb/WpfCreateZipFile/My Project/Settings.Designer.vb # ICSharpCode.SharpZipLib.Samples/vb/WpfCreateZipFile/WpfCreateZipFile.vbproj # ICSharpCode.SharpZipLib.Samples/vb/WpfCreateZipFile/WpfCreateZipFileWindow.xaml # ICSharpCode.SharpZipLib.Samples/vb/WpfCreateZipFile/WpfCreateZipFileWindow.xaml.vb # ICSharpCode.SharpZipLib.Samples/vb/minibzip2/minibzip2.vbproj # ICSharpCode.SharpZipLib.Samples/vb/viewzipfile/viewzipfile.vbproj # ICSharpCode.SharpZipLib.Samples/vb/zipfiletest/zipfiletest.vbproj # ICSharpCode.SharpZipLib.Tests/ICSharpCode.SharpZipLib.Tests.csproj # ICSharpCode.SharpZipLib.Tests/Zip/ZipTests.cs # ICSharpCode.SharpZipLib.Tests/app.config # ICSharpCode.SharpZipLib.Tests/packages.config # ICSharpCode.SharpZipLib/Checksum/Adler32.cs # ICSharpCode.SharpZipLib/Checksum/Crc32.cs # ICSharpCode.SharpZipLib/Checksum/IChecksum.cs # ICSharpCode.SharpZipLib/Checksums/BZip2Crc.cs # ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj # ICSharpCode.SharpZipLib/SharpZipBaseException.cs # ICSharpCode.SharpZipLib/Tar/TarArchive.cs # ICSharpCode.SharpZipLib/Tar/TarHeader.cs # ICSharpCode.SharpZipLib/Tar/TarOutputStream.cs # ICSharpCode.SharpZipLib/Zip/ZipEntry.cs # ICSharpCode.SharpZipLib/Zip/ZipExtraData.cs # ICSharpCode.SharpZipLib/Zip/ZipFile.cs # ICSharpCode.SharpZipLib/Zip/ZipInputStream.cs # README.md # appveyor.yml
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.