Merged branch 'jetty-7' into 'jetty-8'.

jetty-client/src/test/java/org/eclipse/jetty/client/ProxyFakeTunnelTest.java

@@ -68,8 +68,17 @@ public class ProxyFakeTunnelTest extends ProxyTunnellingTest
 
     protected void stopProxy() throws Exception
     {
-        _proxySocket.close();
-        _proxyThread.interrupt();
+        if (_proxySocket != null)
+        {
+            _proxySocket.close();
+            _proxyThread.interrupt();
+        }
+    }
+
+    @Override
+    public void testExternalProxy() throws Exception
+    {
+        // Do not execute this test, since it won't hit the fake proxy
     }
 
     static class FakeProxy extends Thread

jetty-client/src/test/java/org/eclipse/jetty/client/ProxyTunnellingTest.java

@@ -377,7 +377,8 @@ public class ProxyTunnellingTest
         try
         {
             ContentExchange exchange = new ContentExchange(true);
-            exchange.setTimeout(5000);
+            // Use a longer timeout, sometimes the proxy takes a while to answer
+            exchange.setTimeout(20000);
             exchange.setURL("https://www.google.com");
             httpClient.send(exchange);
             assertEquals(HttpExchange.STATUS_COMPLETED, exchange.waitForDone());