From 17ec87f51ccc3761644230412d250bd82ac89e74 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Tue, 8 Sep 2020 09:46:51 +1000
Subject: [PATCH] Issue #1761 - add extra .ini file configuration for gzip.mod

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../src/main/config/etc/jetty-gzip.xml        |  5 +++++
 jetty-server/src/main/config/modules/gzip.mod | 22 +++++++++++++++++--
 .../server/handler/gzip/GzipHandler.java      | 16 +++++++++++++-
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/jetty-server/src/main/config/etc/jetty-gzip.xml b/jetty-server/src/main/config/etc/jetty-gzip.xml
index 24ccbbb4b8c8..0ceac743c4f2 100644
--- a/jetty-server/src/main/config/etc/jetty-gzip.xml
+++ b/jetty-server/src/main/config/etc/jetty-gzip.xml
@@ -18,8 +18,13 @@
         <Set name="inflateBufferSize" property="jetty.gzip.inflateBufferSize"/>
         <Set name="deflaterPoolCapacity" property="jetty.gzip.deflaterPoolCapacity"/>
         <Set name="syncFlush" property="jetty.gzip.syncFlush"/>
+        <Set name="dispatcherTypes" property="jetty.gzip.dispatcherTypes"/>
         <Set name="includedMethodList" property="jetty.gzip.includedMethodList"/>
         <Set name="excludedMethodList" property="jetty.gzip.excludedMethodList"/>
+        <Set name="includedMimeTypes" property="jetty.gzip.includedMimeTypeList"/>
+        <Set name="excludedMimeTypes" property="jetty.gzip.excludedMimeTypeList"/>
+        <Set name="includedPaths" property="jetty.gzip.includedPathList"/>
+        <Set name="excludedPaths" property="jetty.gzip.excludedPathList"/>
 
 <!--
         <Set name="includedMethods">
diff --git a/jetty-server/src/main/config/modules/gzip.mod b/jetty-server/src/main/config/modules/gzip.mod
index 50fa8302865d..19113fa0329c 100644
--- a/jetty-server/src/main/config/modules/gzip.mod
+++ b/jetty-server/src/main/config/modules/gzip.mod
@@ -29,8 +29,26 @@ etc/jetty-gzip.xml
 ## Deflater pool max size (-1 for unlimited, 0 for no pool)
 # jetty.gzip.deflaterPoolCapacity=-1
 
-## Comma separated list of included methods
+## Set the {@link Deflater} flush mode to use.
+# jetty.gzip.syncFlush=false
+
+## The set of DispatcherType that this filter will operate on
+# jetty.gzip.dispatcherTypes=REQUEST
+
+## Comma separated list of included HTTP methods
 # jetty.gzip.includedMethodList=GET,POST
 
-## Comma separated list of excluded methods
+## Comma separated list of excluded HTTP methods
 # jetty.gzip.excludedMethodList=
+
+## Comma separated list of included MIME types
+# jetty.gzip.includedMimeTypeList=
+
+## Comma separated list of excluded MIME types
+# jetty.gzip.excludedMimeTypeList=
+
+## Comma separated list of included Path specs
+# jetty.gzip.includedPathList=
+
+## Comma separated list of excluded Path specs
+# jetty.gzip.excludedPathList=
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
index e1c7b2b06dfb..d7dfe232ccbf 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
@@ -24,6 +24,7 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 import java.util.zip.Deflater;
 import javax.servlet.DispatcherType;
 import javax.servlet.ServletContext;
@@ -772,6 +773,19 @@ public void setExcludedPaths(String... pathspecs)
         _paths.exclude(pathspecs);
     }
 
+    /**
+     * Set of supported {@link DispatcherType} that this filter will operate on.
+     *
+     * @param dispatchers the set of {@link DispatcherType} that this filter will operate on
+     */
+    public void setDispatcherTypes(String... dispatchers)
+    {
+        setDispatcherTypes(Stream.of(dispatchers)
+            .flatMap(s -> Stream.of(StringUtil.csvSplit(s)))
+            .map(DispatcherType::valueOf)
+            .toArray(DispatcherType[]::new));
+    }
+
     /**
      * Set the included filter list of HTTP methods (replacing any previously set)
      *
@@ -902,7 +916,7 @@ public String toString()
         return String.format("%s@%x{%s,min=%s,inflate=%s}", getClass().getSimpleName(), hashCode(), getState(), _minGzipSize, _inflateBufferSize);
     }
 
-    private static class CaseInsensitiveSet extends HashSet<String>
+    public static class CaseInsensitiveSet extends HashSet<String>
     {
         @Override
         public boolean add(String s)