summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-12-15 15:03:51 -0500
committerKohei Yoshida <kohei.yoshida@collabora.com>2014-12-15 15:19:08 -0500
commitcc52524e5b556ae694800df758e5e6917f1ace6c (patch)
treeda4e5b8b82161609c473191b8e90ae5589a6ecfe
parenta7d05673ba6d909e62b5b703f85dc1d1ef96f3d0 (diff)
fdo#87210: Re-enable parallel deflate, which was not the root cause.
With f92183833fa569006602ac7e93c906d2094e0d4d, export no longer crashes, and there is no reason to leave this piece disabled any more. Let's re-enable this. Change-Id: Ibeca8869f152cbcd80f1dcb55f8199110125741d (cherry picked from commit 3fcd2ccb443653740d114b3e4dc371c6b0b6525b)
-rw-r--r--package/source/zippackage/ZipPackageStream.cxx2
1 files changed, 0 insertions, 2 deletions
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index 54d0def91af9..e22b234ee24a 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -810,8 +810,6 @@ bool ZipPackageStream::saveChild(
if (xSeek.is() && xSeek->getLength() < 100000)
bParallelDeflate = false;
- bParallelDeflate = false; // globally disable parallel deflate for now.
-
if (bParallelDeflate)
{
// Start a new thread deflating this zip entry