Merge branch 'jetty-9.1' into release-9.1

jetty-distribution/pom.xml

@@ -680,11 +680,13 @@
       <artifactId>jetty-proxy</artifactId>
       <version>${project.version}</version>
     </dependency>
+<!--
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-overlay-deployer</artifactId>
       <version>${project.version}</version>
     </dependency>
+-->
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jaas</artifactId>

jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java

@@ -258,6 +258,8 @@ public class ProxyServlet extends HttpServlet
         if (value == null || "-".equals(value))
         {
             executor = (Executor)getServletContext().getAttribute("org.eclipse.jetty.server.Executor");
+            if (executor==null)
+                throw new IllegalStateException("No server executor for proxy");
         }
         else
         {

jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java

@@ -239,7 +239,7 @@ public class ProxyServletTest
         result.setProxyConfiguration(new ProxyConfiguration("localhost", proxyConnector.getLocalPort()));
         QueuedThreadPool threadPool = new QueuedThreadPool();
         threadPool.setName("foo");
-        threadPool.setMaxThreads(2);
+        threadPool.setMaxThreads(20);
         result.setExecutor(threadPool);
         result.start();
 
@@ -269,10 +269,9 @@ public class ProxyServletTest
 
         for ( int i = 0; i < 10; ++i )
         {
-
-        Assert.assertEquals(200, responses[i].getStatus());
-        Assert.assertTrue(responses[i].getHeaders().containsKey(PROXIED_HEADER));
-        Assert.assertArrayEquals(content, responses[i].getContent());
+            Assert.assertEquals(200, responses[i].getStatus());
+            Assert.assertTrue(responses[i].getHeaders().containsKey(PROXIED_HEADER));
+            Assert.assertArrayEquals(content, responses[i].getContent());
         }
     }
 

jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/SSLExternalServerTest.java

@@ -38,6 +38,7 @@ import org.eclipse.jetty.util.Fields;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.junit.Assert;
 import org.junit.Assume;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class SSLExternalServerTest extends AbstractHTTPSPDYTest
@@ -58,6 +59,7 @@ public class SSLExternalServerTest extends AbstractHTTPSPDYTest
     }
 
     @Test(timeout=5000)
+    @Ignore
     public void testExternalServer() throws Exception
     {
         String host = "encrypted.google.com";

pom.xml

@@ -442,7 +442,7 @@
     <!-- modules that need fixed and added back, or simply dropped and not maintained
     <module>jetty-rhttp</module>
     -->
-    <module>jetty-overlay-deployer</module>
+    <!--<module>jetty-overlay-deployer</module>-->
   </modules>
   <dependencyManagement>
     <dependencies>