Improve error message and formatting

Author: Long9725

java/org/apache/catalina/startup/Catalina.java

@@ -474,7 +474,10 @@ protected Digester createStartDigester() {
 
         digester.addObjectCreate("Server/Service/Connector/OutputFilterFactory", null, "className");
         digester.addSetProperties("Server/Service/Connector/OutputFilterFactory");
-        digester.addSetNext("Server/Service/Connector/OutputFilterFactory", "addOutputFilterFactory", "org.apache.coyote.http11.filters.OutputFilterFactory");
+        digester.addSetNext(
+                "Server/Service/Connector/OutputFilterFactory",
+                "addOutputFilterFactory",
+                "org.apache.coyote.http11.filters.OutputFilterFactory");
 
         // Add RuleSets for nested elements
         digester.addRuleSet(new NamingRuleSet("Server/GlobalNamingResources/"));

java/org/apache/coyote/CompressionConfig.java

@@ -386,7 +386,9 @@ private OutputFilterFactory negotiateTE(List<OutputFilterFactory> factories, Lis
     /**
      * Negotiate the best encoding from Accept-Encoding entries against available factories.
      */
-    private OutputFilterFactory negotiateAcceptEncoding(List<OutputFilterFactory> factories, List<AcceptEncoding> acceptEncodings) {
+    private OutputFilterFactory negotiateAcceptEncoding(
+            List<OutputFilterFactory> factories,
+            List<AcceptEncoding> acceptEncodings) {
         OutputFilterFactory bestFactory = null;
         double bestQuality = 0;
         int bestServerPriority = Integer.MAX_VALUE;

java/org/apache/coyote/http11/filters/GzipOutputFilter.java

@@ -169,7 +169,8 @@ public void setLevel(int level) {
      */
     public void setBufferSize(int bufferSize) {
         if (bufferSize <= 0) {
-            throw new IllegalArgumentException(sm.getString("gzipOutputFilter.invalidBufferSize", Integer.valueOf(bufferSize)));
+            throw new IllegalArgumentException(
+                    sm.getString("gzipOutputFilter.invalidBufferSize", Integer.valueOf(bufferSize)));
         }
         this.bufferSize = bufferSize;
     }

java/org/apache/coyote/http11/filters/LocalStrings.properties

@@ -33,4 +33,8 @@ gzipOutputFilter.flushFail=Ignored exception while flushing gzip filter
 gzipOutputFilter.invalidLevel=The gzip compression level [{0}] is not valid. Valid values are -1 (default) or 1-9.
 gzipOutputFilter.invalidBufferSize=The gzip buffer size [{0}] is not valid. Must be a positive integer.
 
+# Factory messages (mirror gzipOutputFilter messages for factory-level validation)
+gzipOutputFilterFactory.invalidLevel=The gzip compression level [{0}] is not valid. Valid values are -1 (default) or 1-9.
+gzipOutputFilterFactory.invalidBufferSize=The gzip buffer size [{0}] is not valid. Must be a positive integer.
+
 inputFilter.maxSwallow=maxSwallowSize exceeded

webapps/docs/config/http.xml

@@ -423,7 +423,8 @@
       compression may be used.
       The default value is
       <code>
-      text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/json,application/xml
+      text/html,text/xml,text/plain,text/css,
+      text/javascript,application/javascript,application/json,application/xml
       </code>.
       If you specify a type explicitly, the default is over-ridden.</p>
     </attribute>
@@ -459,33 +460,29 @@
       Units are in bytes.</p>
     </attribute>
 
-    <attribute name="gzipLevel" required="false">
-      <p>If <strong>compression</strong> is set to "on" or "force" then this
-      attribute may be used to configure the compression level for gzip
-      compression. Valid values are <code>-1</code> (default compression)
-      or <code>1</code> through <code>9</code> where <code>1</code> gives
-      beset speed and <code>9</code> gives best compression ratio. If not
-      specified, this attribute defaults to <code>-1</code> (JDK default compression).</p>
-    </attribute>
-
-    <attribute name="gzipBufferSize" required="false">
-      <p>If <strong>compression</strong> is set to "on" or "force" then this
-        attribute may be used to configure the internal buffer size (in bytes)
-        for the gzip compression stream. Larger buffers can improve compression
-        ratios and throughput for bulk responses, while smaller buffers reduce
-        latency for streaming scenarios. If not specified, this attribute
-        defaults to <code>512</code> bytes. </p>
-    </attribute>
-
-    <attribute name="noCompressionEncodings" requried="false">
+    <p>Advanced gzip settings such as compression level and internal buffer
+    size are configured via a nested
+    <code>&lt;OutputFilterFactory&gt;</code> element inside the
+    <code>&lt;Connector&gt;</code>
+    when <strong>compression</strong> is enabled.</p>
+    <pre>
+      &lt;Connector ... compression="on"&gt;
+        &lt;OutputFilterFactory
+            className="org.apache.coyote.http11.filters.GzipOutputFilterFactory"
+            level="-1"
+            bufferSize="512"/&gt;
+      &lt;/Connector&gt;
+    </pre>
+
+    <attribute name="noCompressionEncodings" required="false">
       <p>A comma-separated list of content encodings that indicate
       already-compressed content. When the response already has a
       <code>Content-Encoding</code> header with one of these values, compression
       will not be applied to prevent double compression. This attribute is only
       used if <strong>compression</strong> is set to <code>on</code> or
       <code>force</code>.</p>
       <p>If not specified, the default values is
-      <code>br,compress,dcb,dcz,deflate,gzip,pack2000-gzip,zstd</code>, which
+      <code>br,compress,dcb,dcz,deflate,gzip,pack200-gzip,zstd</code>, which
       includes all commonly used compression algorithms. This can be customized
       to support custom compression algorithms when using a custom
       <code>outputFilterFactory</code>.</p>
@@ -683,15 +680,15 @@
       used.</p>
     </attribute>
 
-    <attribute name="noCompressionEncodings" requried="false">
+    <attribute name="noCompressionEncodings" required="false">
       <p>A comma-separated list of content encodings that indicate
       already-compressed content. When the response already has a
       <code>Content-Encoding</code> header with one of these values, compression
       will not be applied to prevent double compression. This attribute is only
       used if <strong>compression</strong> is set to <code>on</code> or
       <code>force</code>.</p>
       <p>If not specified, the default values is
-      <code>br,compress,dcb,dcz,deflate,gzip,pack2000-gzip,zstd</code>, which
+      <code>br,compress,dcb,dcz,deflate,gzip,pack200-gzip,zstd</code>, which
       includes all commonly used compression algorithms.</p>
     </attribute>