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

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

@@ -111,13 +111,19 @@ public class AsyncHttpConnection extends AbstractHttpConnection implements Async
 
                         reset();
 
-                        // TODO Is this required?
+                        // TODO Is this still required?
                         if (!_generator.isPersistent() && !_endp.isOutputShutdown())
                         {
-                            LOG.warn("Safety net oshut!!!");
+                            LOG.warn("Safety net oshut!!!  IF YOU SEE THIS, PLEASE RAISE BUGZILLA");
                             _endp.shutdownOutput();
                         }
                     }
+                    else if (_request.getAsyncContinuation().isAsyncStarted())
+                    {
+                        // The request is suspended, so even though progress has been made, break the while loop
+                        LOG.debug("suspended {}",this);
+                        break;
+                    }
                 }
             }
         }

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

@@ -35,16 +35,16 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-public class AsyncContextTest
+public class LocalAsyncContextTest
 {
     protected Server _server = new Server();
     protected SuspendHandler _handler = new SuspendHandler();
-    protected LocalConnector _connector;
+    protected Connector _connector;
 
     @Before
     public void init() throws Exception
     {
-        _connector = new LocalConnector();
+        _connector = initConnector();
         _server.setConnectors(new Connector[]{ _connector });
 
         SessionHandler session = new SessionHandler();
@@ -53,6 +53,11 @@ public class AsyncContextTest
         _server.setHandler(session);
         _server.start();
     }
+    
+    protected Connector initConnector()
+    {
+        return new LocalConnector();
+    }
 
     @After
     public void destroy() throws Exception
@@ -178,14 +183,21 @@ public class AsyncContextTest
 
     private synchronized String process(String content) throws Exception
     {
-        String request = "GET / HTTP/1.1\r\n" + "Host: localhost\r\n";
+        String request = "GET / HTTP/1.1\r\n" + 
+        "Host: localhost\r\n"+
+        "Connection: close\r\n";
 
         if (content==null)
             request+="\r\n";
         else
-            request+="Content-Length: "+content.length()+"\r\n" + "\r\n" + content;
+            request+="Content-Length: "+content.length()+"\r\n" +"\r\n" + content;
 
-        return _connector.getResponses(request);
+        return getResponse(request);
+    }
+    
+    protected String getResponse(String request) throws Exception
+    {
+        return ((LocalConnector)_connector).getResponses(request);
     }
 
     private static class SuspendHandler extends HandlerWrapper

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

@@ -0,0 +1,26 @@
+package org.eclipse.jetty.server;
+
+import java.net.Socket;
+
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.util.IO;
+
+public class SelectChannelAsyncContextTest extends LocalAsyncContextTest
+{
+
+    @Override
+    protected Connector initConnector()
+    {
+        return new SelectChannelConnector();
+    }
+
+    @Override
+    protected String getResponse(String request) throws Exception
+    {
+        SelectChannelConnector connector = (SelectChannelConnector)_connector;
+        Socket socket = new Socket((String)null,connector.getLocalPort());
+        socket.getOutputStream().write(request.getBytes("UTF-8"));
+        return IO.toString(socket.getInputStream());
+    }
+
+}