From 46f051187618e4172ed30c99a2cfece61016ef71 Mon Sep 17 00:00:00 2001
From: JamesHillyard <73830120+JamesHillyard@users.noreply.github.com>
Date: Mon, 13 Sep 2021 11:10:42 +0100
Subject: [PATCH 1/2] Merge pull request #31 from JamesHillyard/FISH-376

FISH-376 Allow finer configuration details of HTTP GZIP compression
---
 .../grizzly/compression/zip/GZipEncoder.java  | 11 ++++++-
 .../grizzly/http/GZipContentEncoding.java     | 29 +++++++++++++++----
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/compression/zip/GZipEncoder.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/compression/zip/GZipEncoder.java
index dca092b84e..a2db37126b 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/compression/zip/GZipEncoder.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/compression/zip/GZipEncoder.java
@@ -43,6 +43,8 @@ public class GZipEncoder extends AbstractTransformer<Buffer, Buffer> {
     private static final int TRAILER_SIZE = 8;
 
     private final int bufferSize;
+    private static int compressionLevel;
+    private static int compressionStrategy;
 
     private static final Buffer header;
 
@@ -67,7 +69,13 @@ public GZipEncoder() {
     }
 
     public GZipEncoder(int bufferSize) {
+        this(bufferSize, Deflater.DEFAULT_COMPRESSION, Deflater.DEFAULT_STRATEGY);
+    }
+
+    public GZipEncoder(int bufferSize, int compressionLevel, int compressionStrategy) {
         this.bufferSize = bufferSize;
+        this.compressionLevel = compressionLevel;
+        this.compressionStrategy = compressionStrategy;
     }
 
     /**
@@ -283,7 +291,8 @@ protected static final class GZipOutputState extends LastResultAwareState<Buffer
         private Deflater deflater;
 
         private void initialize() {
-            final Deflater newDeflater = new Deflater(Deflater.DEFAULT_COMPRESSION, true);
+            final Deflater newDeflater = new Deflater(compressionLevel, true);
+            newDeflater.setStrategy(compressionStrategy);
             final CRC32 newCrc32 = new CRC32();
             newCrc32.reset();
             deflater = newDeflater;
diff --git a/modules/http/src/main/java/org/glassfish/grizzly/http/GZipContentEncoding.java b/modules/http/src/main/java/org/glassfish/grizzly/http/GZipContentEncoding.java
index 61a24468a4..db20a8bca9 100644
--- a/modules/http/src/main/java/org/glassfish/grizzly/http/GZipContentEncoding.java
+++ b/modules/http/src/main/java/org/glassfish/grizzly/http/GZipContentEncoding.java
@@ -23,6 +23,8 @@
 import org.glassfish.grizzly.compression.zip.GZipEncoder;
 import org.glassfish.grizzly.memory.Buffers;
 
+import java.util.zip.Deflater;
+
 /**
  * GZip {@link ContentEncoding} implementation, which compresses/decompresses HTTP content using gzip algorithm.
  *
@@ -59,17 +61,32 @@ public GZipContentEncoding(int inBufferSize, int outBufferSize) {
     }
 
     /**
-     * Construct <tt>GZipContentEncoding</tt> using specific buffer sizes.
-     * 
+     * Construct <tt>GZipContentEncoding</tt> using specific buffer sizes, with default compression level and strategy.
      * @param inBufferSize input buffer size
      * @param outBufferSize output buffer size
-     * @param encoderFilter {@link EncodingFilter}, which will decide if <tt>GZipContentEncoding</tt> should be applied to
-     * encode specific {@link HttpHeader} packet.
+     * @param encoderFilter {@link EncodingFilter}, which will decide if
+     * <tt>GZipContentEncoding</tt> should be applied to encode specific
+     *                 {@link HttpHeader} packet.
      */
     public GZipContentEncoding(int inBufferSize, int outBufferSize, EncodingFilter encoderFilter) {
-        this.decoder = new GZipDecoder(inBufferSize);
-        this.encoder = new GZipEncoder(outBufferSize);
+        this(inBufferSize, outBufferSize, Deflater.DEFAULT_COMPRESSION, Deflater.DEFAULT_STRATEGY, encoderFilter);
+    }
 
+    /**
+     * Construct <tt>GZipContentEncoding</tt> using specific buffer sizes, compression level and strategy.
+     * @param inBufferSize input buffer size
+     * @param outBufferSize output buffer size
+     * @param compressionLevel the compression level used by the GZipEncoder
+     * @param compressionStrategy the compression strategy used by the GZipEncoder
+     * @param encoderFilter {@link EncodingFilter}, which will decide if
+     * <tt>GZipContentEncoding</tt> should be applied to encode specific
+     *                 {@link HttpHeader} packet.
+     */
+    public GZipContentEncoding(int inBufferSize, int outBufferSize, int compressionLevel, int compressionStrategy,
+                               EncodingFilter encoderFilter) {
+
+        this.decoder = new GZipDecoder(inBufferSize);
+        this.encoder = new GZipEncoder(outBufferSize, compressionLevel, compressionStrategy);
         if (encoderFilter != null) {
             this.encoderFilter = encoderFilter;
         } else {

From 3ec98e25458def385c1f8f9b51edd24071c95103 Mon Sep 17 00:00:00 2001
From: Matt Gill <matthew.gill@live.co.uk>
Date: Mon, 9 Apr 2018 10:34:26 +0100
Subject: [PATCH 2/2] Updated Grizzly version matcher to not match entire
 pattern.

Signed-off-by: Matt Gill <matthew.gill@live.co.uk>
---
 .../grizzly/src/main/java/org/glassfish/grizzly/Grizzly.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/Grizzly.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/Grizzly.java
index b6e0010165..8c60c62c14 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/Grizzly.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/Grizzly.java
@@ -66,7 +66,7 @@ public static Logger logger(Class clazz) {
         }
         String version = prop.getProperty("grizzly.version");
         Matcher matcher = versionPattern.matcher(version);
-        if (matcher.matches()) {
+        if (matcher.find()) {
             dotedVersion = matcher.group(1);
             major = Integer.parseInt(matcher.group(2));
             minor = Integer.parseInt(matcher.group(3));