From 2c384bb78da62d32665e09b995a28c9177362929 Mon Sep 17 00:00:00 2001
From: Jesse McConnell <jesse.mcconnell@gmail.com>
Date: Thu, 21 Jun 2012 12:14:23 -0500
Subject: [PATCH] [Bug 383251] socket timeout exception returns 504,
 ioexception returns 500 in connector handler

---
 .../org/eclipse/jetty/server/handler/ConnectHandler.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

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 0b6e5238548..dba192ee8f0 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());