From c29491e5ac70c98e4d7d7dff2a6465ddecc45c0c Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Thu, 8 Jun 2023 10:19:24 +0200
Subject: [PATCH] Fixes #9887 - Deprecate CGI Servlet. (#9889)

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
---
 .../src/main/webapp/WEB-INF/web.xml                  | 12 ------------
 .../main/java/org/eclipse/jetty/servlets/CGI.java    |  3 +++
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/web.xml b/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/web.xml
index 615a3775211..b610408e0da 100644
--- a/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/web.xml
@@ -121,18 +121,6 @@
     <url-pattern>/dispatch/*</url-pattern>
   </servlet-mapping>
   
-  <servlet>
-    <servlet-name>CGI</servlet-name>
-    <servlet-class>org.eclipse.jetty.servlets.CGI</servlet-class>
-    <load-on-startup>1</load-on-startup>
-    <async-supported>true</async-supported>
-  </servlet>
-  
-  <servlet-mapping>
-    <servlet-name>CGI</servlet-name>
-    <url-pattern>/cgi-bin/*</url-pattern>
-  </servlet-mapping>
-  
   <servlet>
     <servlet-name>Chat</servlet-name>
     <servlet-class>com.acme.ChatServlet</servlet-class>
diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CGI.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CGI.java
index 4ce419b4e78..34ad3d6434c 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CGI.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CGI.java
@@ -62,7 +62,10 @@ import org.slf4j.LoggerFactory;
  * <dt>ignoreExitState</dt>
  * <dd>If true then do not act on a non-zero exec exit status")</dd>
  * </dl>
+ *
+ * @deprecated do not use, no replacement, will be removed in a future release.
  */
+@Deprecated(forRemoval = true)
 public class CGI extends HttpServlet
 {
     private static final long serialVersionUID = -6182088932884791074L;