Merge pull request #1 from emonty/master

[FIXED JENKINS-12696] Looks good to me.
jenkinsci · Feb 9, 2012 · 0681284 · 0681284
2 parents b862ef3 + d2a447a
commit 0681284
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/urltrigger/URLTrigger.java b/src/main/java/org/jenkinsci/plugins/urltrigger/URLTrigger.java
@@ -138,6 +138,11 @@ private Client getClientObject(URLTriggerEntry entry, XTriggerLog log) {
         if (isAuthBasic(entry)) {
             addBasicAuth(entry, log, client);
         }
+        /* Set a connect and read timeout. If this hangs, it can actually
+           take down all of the jenkins schedule events.
+           This is 5 minutes expressed as milliseconds. */
+        client.setConnectTimeout(300000);
+        client.setReadTimeout(300000);
         return client;
     }