diff --git a/VERSION.txt b/VERSION.txt index 4186fabf1fc..95e5605ace8 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,6 +1,7 @@ jetty-7.0.0.M2-SNAPSHOT -+ JETTY-941 Linux chkconfig hint -+ JETTY-996 Make start-stop-daemon optional + + JETTY-941 Linux chkconfig hint + + JETTY-959 CGI servlet doesn't kill the CGI in case the client disconnects + + JETTY-996 Make start-stop-daemon optional jetty-7.0.0.M1 22 April 2009 + 271258 FORM Authentication dispatch handling avoids caching 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 5f494baf575..0288e140e26 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 @@ -355,7 +355,16 @@ public class CGI extends HttpServlet finally { if( os != null ) - os.close(); + { + try + { + os.close(); + } + catch(Exception e) + { + Log.ignore(e); + } + } os = null; p.destroy(); // Log.debug("CGI: terminated!");