Merge remote-tracking branch 'origin/master' into jetty-9.1

jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java

@@ -485,7 +485,8 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http
                 {
                     case NEED_HEADER:
                     {
-                        if (_lastContent && _content!=null && BufferUtil.space(_content)>_config.getResponseHeaderSize() && _content.hasArray() )
+                        // Look for optimisation to avoid allocating a _header buffer
+                        if (_lastContent && _content!=null && !_content.isReadOnly() && _content.hasArray() && BufferUtil.space(_content)>_config.getResponseHeaderSize() )
                         {
                             // use spare space in content buffer for header buffer
                             int p=_content.position();

jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java

@@ -302,7 +302,8 @@ public class HttpOutput extends ServletOutputStream implements Runnable
 
         // write any remaining content in the buffer directly
         if (len>0)
-            _channel.write(ByteBuffer.wrap(b, off, len), complete);
+            // pass as readonly to avoid space stealing optimisation in HttpConnection 
+            _channel.write(ByteBuffer.wrap(b, off, len).asReadOnlyBuffer(), complete);
         else if (complete)
             _channel.write(BufferUtil.EMPTY_BUFFER,complete);
 

jetty-server/src/test/java/org/eclipse/jetty/server/HttpOutputTest.java

@@ -19,6 +19,7 @@
 package org.eclipse.jetty.server;
 
 import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
 import java.io.FilterInputStream;
@@ -26,6 +27,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
+import java.util.Arrays;
 
 import javax.servlet.AsyncContext;
 import javax.servlet.ServletException;
@@ -38,6 +40,7 @@ import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.resource.Resource;
 import org.hamcrest.Matchers;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -81,6 +84,26 @@ public class HttpOutputTest
         assertThat(response,containsString("HTTP/1.1 200 OK"));
     }
     
+    @Test
+    public void testSendArray() throws Exception
+    {
+        byte[] buffer=new byte[16*1024];
+        Arrays.fill(buffer,0,4*1024,(byte)0x99);
+        Arrays.fill(buffer,4*1024,12*1024,(byte)0x58);
+        Arrays.fill(buffer,12*1024,16*1024,(byte)0x66);
+        _handler._content=ByteBuffer.wrap(buffer);
+        _handler._content.limit(12*1024);
+        _handler._content.position(4*1024);
+        String response=_connector.getResponses("GET / HTTP/1.0\nHost: localhost:80\n\n");
+        assertThat(response,containsString("HTTP/1.1 200 OK"));
+        assertThat(response,containsString("\r\nXXXXXXXXXXXXXXXXXXXXXXXXXXX"));
+        
+        for (int i=0;i<4*1024;i++)
+            assertEquals("i="+i,(byte)0x99,buffer[i]);
+        for (int i=12*1024;i<16*1024;i++)
+            assertEquals("i="+i,(byte)0x66,buffer[i]);
+    }
+    
     @Test
     public void testSendInputStreamSimple() throws Exception
     {
@@ -389,6 +412,7 @@ public class HttpOutputTest
         ByteBuffer _content;
         InputStream _contentInputStream;
         ReadableByteChannel _contentChannel;
+        ByteBuffer _content;
         
         @Override
         public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
@@ -398,6 +422,17 @@ public class HttpOutputTest
             
             final HttpOutput out = (HttpOutput) response.getOutputStream();
             
+            if (_content!=null)
+            {
+                response.setContentLength(_content.remaining());
+                if (_content.hasArray())
+                    out.write(_content.array(),_content.arrayOffset()+_content.position(),_content.remaining());
+                else
+                    out.sendContent(_content);
+                _content=null;
+                return;
+            }
+            
             if (_contentInputStream!=null)
             {
                 out.sendContent(_contentInputStream);