Merge remote-tracking branch 'apache/master' into COMPRESS-382 # Conflicts: # src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java # src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java
Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/3ecbdd79 Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/3ecbdd79 Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/3ecbdd79 Branch: refs/heads/master Commit: 3ecbdd79ee964d325b7ce8a1ca982935cc7d92f7 Parents: 70594bc 13a0390 Author: tballison <talli...@mitre.org> Authored: Fri Apr 21 14:22:39 2017 -0400 Committer: tballison <talli...@mitre.org> Committed: Fri Apr 21 14:22:39 2017 -0400 ---------------------------------------------------------------------- src/changes/changes.xml | 7 ++ .../archivers/ArchiveStreamFactory.java | 111 ++++++++++------- .../compressors/CompressorStreamFactory.java | 123 ++++++++++--------- .../pack200/Pack200CompressorOutputStream.java | 10 +- .../commons/compress/ArchiveReadTest.java | 11 +- .../commons/compress/MockEvilInputStream.java | 41 +++++++ .../archivers/ArchiveStreamFactoryTest.java | 46 +++++++ .../compress/archivers/LongPathTest.java | 15 ++- .../compress/archivers/LongSymLinkTest.java | 13 +- .../compressors/DetectCompressorTestCase.java | 62 +++++++--- 10 files changed, 306 insertions(+), 133 deletions(-) ----------------------------------------------------------------------
