diff options
author | Jesse McConnell | 2012-06-21 17:14:23 +0000 |
---|---|---|
committer | Jesse McConnell | 2012-06-21 17:14:23 +0000 |
commit | 2c384bb78da62d32665e09b995a28c9177362929 (patch) | |
tree | 8dcd06a67616ebecd5d11b8669c56cb46735d85f | |
parent | 42843730ac6bec7b2b6c8d92c36fc0aaa131a524 (diff) | |
download | org.eclipse.jetty.project-2c384bb78da62d32665e09b995a28c9177362929.tar.gz org.eclipse.jetty.project-2c384bb78da62d32665e09b995a28c9177362929.tar.xz org.eclipse.jetty.project-2c384bb78da62d32665e09b995a28c9177362929.zip |
[Bug 383251] socket timeout exception returns 504, ioexception returns 500 in connector handler
-rw-r--r-- | jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java | 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()); |