Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2012-04-12 07:14:53 +0000
committerGerrit Code Review @ Eclipse.org2012-04-12 07:14:53 +0000
commit9cc43c5f937fdf125dd09762d32699be2a9423cc (patch)
treebaa331e8bb7221ce91dee495d1c1de4e54ec1fbd
parent436743e7d5ad268b9a32311af31bcef4928098cc (diff)
parentd98f699bea4a8ee62e01a3c32d0f8feda4e1fc62 (diff)
downloadorg.eclipse.jetty.project-9cc43c5f937fdf125dd09762d32699be2a9423cc.tar.gz
org.eclipse.jetty.project-9cc43c5f937fdf125dd09762d32699be2a9423cc.tar.xz
org.eclipse.jetty.project-9cc43c5f937fdf125dd09762d32699be2a9423cc.zip
Merge "376519: Change compression type of deflate compression in GzipFilter and IncludableGzipFilter"
-rw-r--r--jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java3
-rw-r--r--jetty-servlets/src/main/java/org/eclipse/jetty/servlets/IncludableGzipFilter.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
index 650632b7f3..f30ff4189c 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
@@ -17,6 +17,7 @@ import java.util.HashSet;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.regex.Pattern;
+import java.util.zip.Deflater;
import java.util.zip.DeflaterOutputStream;
import java.util.zip.GZIPOutputStream;
@@ -255,7 +256,7 @@ public class GzipFilter extends UserAgentFilter
@Override
protected DeflaterOutputStream createStream() throws IOException
{
- return new DeflaterOutputStream(_response.getOutputStream());
+ return new DeflaterOutputStream(_response.getOutputStream(),new Deflater(Deflater.DEFAULT_COMPRESSION));
}
};
}
diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/IncludableGzipFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/IncludableGzipFilter.java
index 972393e164..95de423bc4 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/IncludableGzipFilter.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/IncludableGzipFilter.java
@@ -18,6 +18,7 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
+import java.util.zip.Deflater;
import java.util.zip.DeflaterOutputStream;
import java.util.zip.GZIPOutputStream;
@@ -94,7 +95,7 @@ public class IncludableGzipFilter extends GzipFilter
@Override
protected DeflaterOutputStream createStream() throws IOException
{
- return new DeflaterOutputStream(_response.getOutputStream());
+ return new DeflaterOutputStream(_response.getOutputStream(),new Deflater(Deflater.DEFAULT_COMPRESSION));
}
};
}

Back to the top