From 72419b875024efae04931a9ce06b8cda8173cb9e Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sat, 21 Nov 2020 20:29:36 -0500 Subject: [PATCH] revert gzip change, breaks charset encoding test --- .../org/cobbzilla/util/http/HttpContentEncodingType.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/cobbzilla/util/http/HttpContentEncodingType.java b/src/main/java/org/cobbzilla/util/http/HttpContentEncodingType.java index 1cc111e..77498b0 100644 --- a/src/main/java/org/cobbzilla/util/http/HttpContentEncodingType.java +++ b/src/main/java/org/cobbzilla/util/http/HttpContentEncodingType.java @@ -8,13 +8,13 @@ import lombok.AllArgsConstructor; import org.apache.commons.compress.compressors.deflate.DeflateCompressorInputStream; import org.apache.commons.compress.compressors.deflate.DeflateCompressorOutputStream; import org.apache.commons.compress.compressors.deflate.DeflateParameters; -import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; -import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream; import org.apache.commons.io.IOUtils; import org.cobbzilla.util.io.FilterInputStreamViaOutputStream; import org.cobbzilla.util.system.Bytes; import java.io.*; +import java.util.zip.GZIPInputStream; +import java.util.zip.GZIPOutputStream; import static org.cobbzilla.util.daemon.ZillaRuntime.die; @@ -23,9 +23,7 @@ public enum HttpContentEncodingType { identity (BufferedInputStream::new, BufferedOutputStream::new, BufferedOutputStream.class), - gzip ((in, bufsiz) -> new GzipCompressorInputStream(in), - GzipCompressorOutputStream::new, - GzipCompressorOutputStream.class), + gzip (GZIPInputStream::new, GZIPOutputStream::new, GZIPOutputStream.class), deflate ((in, bufsiz) -> new DeflateCompressorInputStream(in, Constants.DEFLATE_PARAMETERS), out -> new DeflateCompressorOutputStream(out, Constants.DEFLATE_PARAMETERS),