Add timeout and idleTimeout servlet init parameters to the creation of the http client

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3391 7e9141cc-0065-0410-87d8-b60c137991c4

1 files changed, 14 insertions, 0 deletions

diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
index f6bedc0bc1..8e8eb7adea 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
@@ -204,6 +204,20 @@ public class ProxyServlet implements Servlet
         {
             client.setMaxConnectionsPerAddress(Integer.parseInt(t));
         }
+       
+        t = config.getInitParameter("timeout");
+        
+        if ( t != null )
+        {
+            client.setTimeout(Long.parseLong(t));
+        }
+        
+        t = config.getInitParameter("idleTimeout");
+        
+        if ( t != null )
+        {
+            client.setIdleTimeout(Long.parseLong(t));
+        }
         
         client.start();