1 files changed, 31 insertions, 8 deletions

diff --git a/tests/libtest/lib533.c b/tests/libtest/lib533.c
index b0d63a10e..24c36d0d0 100644
--- a/tests/libtest/lib533.c
+++ b/tests/libtest/lib533.c
@@ -16,6 +16,11 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#include "timeval.h"
+
+#define MAIN_LOOP_HANG_TIMEOUT     45 * 1000
+#define MULTI_PERFORM_HANG_TIMEOUT 30 * 1000
+
 int test(char *URL)
 {
   int res = 0;
@@ -24,8 +29,10 @@ int test(char *URL)
   char done=FALSE;
   CURLM *m;
   int current=0;
-  int loop1 = 40;
-  int loop2 = 20;
+  struct timeval ml_start;
+  struct timeval mp_start;
+  char ml_timedout = FALSE;
+  char mp_timedout = FALSE;
 
   /* In windows, this will init the winsock stuff */
   curl_global_init(CURL_GLOBAL_ALL);
@@ -44,19 +51,34 @@ int test(char *URL)
 
   res = (int)curl_multi_add_handle(m, curl);
 
+  ml_timedout = FALSE;
+  ml_start = curlx_tvnow();
+
   fprintf(stderr, "Start at URL 0\n");
 
-  while ((--loop1>0) && (loop2>0) && (!done)) {
+  while (!done) {
     fd_set rd, wr, exc;
     int max_fd;
     struct timeval interval;
 
     interval.tv_sec = 1;
     interval.tv_usec = 0;
-    loop2 = 20;
 
-    while ((--loop2>0) && (res == CURLM_CALL_MULTI_PERFORM)) {
+    if (curlx_tvdiff(curlx_tvnow(), ml_start) > 
+        MAIN_LOOP_HANG_TIMEOUT) {
+      ml_timedout = TRUE;
+      break;
+    }
+    mp_timedout = FALSE;
+    mp_start = curlx_tvnow();
+
+    while (res == CURLM_CALL_MULTI_PERFORM) {
       res = (int)curl_multi_perform(m, &running);
+      if (curlx_tvdiff(curlx_tvnow(), mp_start) > 
+          MULTI_PERFORM_HANG_TIMEOUT) {
+        mp_timedout = TRUE;
+        break;
+      }
       if (running <= 0) {
         if(!current++) {
           fprintf(stderr, "Advancing to URL 1\n");
@@ -83,7 +105,7 @@ int test(char *URL)
         break;
       }
     }
-    if ((loop2 <= 0) || (done))
+    if (mp_timedout || done)
       break;
 
     if (res != CURLM_OK) {
@@ -111,8 +133,9 @@ int test(char *URL)
     res = CURLM_CALL_MULTI_PERFORM;
   }
 
-  if ((loop1 <= 0) || (loop2 <= 0)) {
-    fprintf(stderr, "loop1: %d loop2: %d \n", loop1, loop2);
+  if (ml_timedout || mp_timedout) {
+    if (ml_timedout) fprintf(stderr, "ml_timedout\n");
+    if (mp_timedout) fprintf(stderr, "mp_timedout\n");
     fprintf(stderr, "ABORTING TEST, since it seems "
             "that it would have run forever.\n");
     res = 77;