This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new 58fb49bd64 Improve formatting prior to running auto-format tools
58fb49bd64 is described below

commit 58fb49bd64db6de1d30776d1a210dafc72a7a9f1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 8 10:13:10 2023 +0000

    Improve formatting prior to running auto-format tools
---
 java/org/apache/catalina/servlets/CGIServlet.java | 39 +++++++++++++----------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/java/org/apache/catalina/servlets/CGIServlet.java 
b/java/org/apache/catalina/servlets/CGIServlet.java
index eb38e2b437..571cd10871 100644
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -659,11 +659,12 @@ public final class CGIServlet extends HttpServlet {
     }
 
 
-    /**
+    /*
      * Behaviour depends on the status code.
      *
      * Status < 400  - Calls setStatus. Returns false. CGI servlet will provide
      *                 the response body.
+     *
      * Status >= 400 - Calls sendError(status), returns true. Standard error
      *                 page mechanism will provide the response body.
      */
@@ -1876,22 +1877,26 @@ public final class CGIServlet extends HttpServlet {
 
             int i = input.read();
 
-            // Update the state
-            // State machine looks like this
-            //
-            //    -------->--------
-            //   |      (CR)       |
-            //   |                 |
-            //  CR1--->---         |
-            //   |        |        |
-            //   ^(CR)    |(LF)    |
-            //   |        |        |
-            // CHAR--->--LF1--->--EOH
-            //      (LF)  |  (LF)  |
-            //            |(CR)    ^(LF)
-            //            |        |
-            //          (CR2)-->---
-
+            /*
+             * Update the state
+             * State machine looks like this
+             * @formatter:off
+             *
+             *    -------->--------
+             *   |      (CR)       |
+             *   |                 |
+             *  CR1--->---         |
+             *   |        |        |
+             *   ^(CR)    |(LF)    |
+             *   |        |        |
+             * CHAR--->--LF1--->--EOH
+             *      (LF)  |  (LF)  |
+             *            |(CR)    ^(LF)
+             *            |        |
+             *          (CR2)-->---
+             *
+             * @formatter:on
+             */
             if (i == 10) {
                 // LF
                 switch(state) {


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to