From 87d35a5dfd24efc5506b3233dc0767039a27358c Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Fri, 26 Jun 2009 00:34:00 +0000 Subject: [PATCH] JETTY-1048 git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@439 7e9141cc-0065-0410-87d8-b60c137991c4 --- VERSION.txt | 1 + .../java/org/eclipse/jetty/servlet/DefaultServlet.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 12492b8d39b..63cd6d1fe78 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,6 +1,7 @@ jetty-7.0.0.M4-SNAPSHOT + 281059 NPE in QTP with debug on + JETTY-1042 Prevent cookie leak between shared connection + + JETTY-1048 Fix for large partially filtered static content jetty-7.0.0.M3 20 June 2009 + fixed race with expired async listeners diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java index 964771846a5..8de5fbe769d 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java @@ -690,11 +690,16 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory writeOptionHeaders(((Response)response).getHttpFields()); ((HttpConnection.Output)out).sendContent(content); } - else + else if (content.getBuffer()!=null) { writeHeaders(response,content,content_length); ((HttpConnection.Output)out).sendContent(content.getBuffer()); } + else + { + writeHeaders(response,content,content_length); + resource.writeTo(out,0,content_length); + } } else {