Merge branch 'master' into jetty-8

1 files changed, 8 insertions, 0 deletions

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java
index 0b6e523854..dba192ee8f 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java
@@ -2,6 +2,7 @@ package org.eclipse.jetty.server.handler;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.SelectionKey;
@@ -230,6 +231,13 @@ public class ConnectHandler extends HandlerWrapper
         {
             channel = connectToServer(request,host,port);
         }
+        catch (SocketException se)
+        {
+            LOG.info("ConnectHandler: " + se.getMessage());
+            response.setStatus(HttpServletResponse.SC_GATEWAY_TIMEOUT);
+            baseRequest.setHandled(true);
+            return;
+        }
         catch (SocketTimeoutException ste)
         {
             LOG.info("ConnectHandler: " + ste.getMessage());