From 3fb3616b210697e540c200020d84e0fdc04eb463 Mon Sep 17 00:00:00 2001
From: Jesse McConnell <jesse.mcconnell@gmail.com>
Date: Mon, 30 Sep 2013 19:11:34 -0500
Subject: [PATCH 1/3] remove overlay deployer for 9.1 while it gets
 reconsidered in new module system

---
 jetty-distribution/pom.xml | 2 ++
 pom.xml                    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 3f4eafb3147..103312d7736 100644
--- a/jetty-distribution/pom.xml
+++ b/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>
diff --git a/pom.xml b/pom.xml
index 5456315c53e..ffe31bfc0e9 100644
--- a/pom.xml
+++ b/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>

From 2ef92d547761452e32d5b3fc4c32f5b4ec7a377a Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@intalio.com>
Date: Tue, 1 Oct 2013 10:38:50 +1000
Subject: [PATCH 2/3] fixed proxy tests

---
 .../main/java/org/eclipse/jetty/proxy/ProxyServlet.java  | 2 ++
 .../java/org/eclipse/jetty/proxy/ProxyServletTest.java   | 9 ++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
index 3c6ab64263e..98a25f77add 100644
--- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
+++ b/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
         {
diff --git a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
index 7739fe8cf31..2d356edcde3 100644
--- a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
+++ b/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());
         }
     }
 

From 2d7f1a227251e974ef7378321f8c88fc9db86c1e Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@intalio.com>
Date: Tue, 1 Oct 2013 11:18:09 +1000
Subject: [PATCH 3/3] ignore test dependent on external server

---
 .../eclipse/jetty/spdy/server/http/SSLExternalServerTest.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/SSLExternalServerTest.java b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/SSLExternalServerTest.java
index 6465b58f563..def73036ae6 100644
--- a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/SSLExternalServerTest.java
+++ b/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";