summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorDavid Yu2009-04-24 03:30:29 (EDT)
committer David Yu2009-04-24 03:30:29 (EDT)
commit756cd03edf5b38ba9e1575c061dcec9e083c84de (patch)
tree6bf240601367559cdf93625cd1bc66ea2aeec4f2
parent910a22426bf8c533b07c4c3caa8c533a57da594f (diff)
downloadorg.eclipse.jetty.project-756cd03edf5b38ba9e1575c061dcec9e083c84de.zip
org.eclipse.jetty.project-756cd03edf5b38ba9e1575c061dcec9e083c84de.tar.gz
org.eclipse.jetty.project-756cd03edf5b38ba9e1575c061dcec9e083c84de.tar.bz2
JETTY-959 CGI servlet doesn't kill the CGI in case the client disconnects
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@192 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--VERSION.txt5
-rw-r--r--jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CGI.java11
2 files changed, 13 insertions, 3 deletions
diff --git a/VERSION.txt b/VERSION.txt
index 4186fab..95e5605 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 5f494ba..0288e14 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!");