Several minor fixes:

Limit size of indirect buffer for direct serving of content.
default servlet redirects directories without trailing / better

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2557 7e9141cc-0065-0410-87d8-b60c137991c4

1 files changed, 11 insertions, 0 deletions

diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
index 38a73d12ab..f37a14c9d1 100644
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
+++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
@@ -43,11 +43,20 @@ public interface HttpContent
     {
         final Resource _resource;
         final Buffer _mimeType;
+        final int _maxBuffer;
 
         public ResourceAsHttpContent(final Resource resource, final Buffer mimeType)
         {
             _resource=resource;
             _mimeType=mimeType;
+            _maxBuffer=-1;
+        }
+        
+        public ResourceAsHttpContent(final Resource resource, final Buffer mimeType, int maxBuffer)
+        {
+            _resource=resource;
+            _mimeType=mimeType;
+            _maxBuffer=maxBuffer;
         }
 
         /* ------------------------------------------------------------ */
@@ -73,6 +82,8 @@ public interface HttpContent
         {
             try
             {
+                if (_maxBuffer<_resource.length())
+                    return null;
                 ByteArrayBuffer buffer = new ByteArrayBuffer((int)_resource.length());
                 buffer.readFrom(_resource.getInputStream(),(int)_resource.length());
                 return buffer;