even when we get a single connection to deal with, we must still check for

timeout'ed connections and possibly deal with them too

diff --git a/lib/multi.c b/lib/multi.c
index fa88cdaab7d2ca3780e5a6bfbea0f39adaeec6f1..4e6efecd16cd4db323bcbee21c3f30dd70de6d35 100644 (file)
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -1203,10 +1203,9 @@ static CURLMcode multi_socket(struct Curl_multi *multi,
          last */
       singlesocket(multi, data->set.one_easy);
 
-    *running_handles = multi->num_alive;
-
-    /* or should we fall-through and do the timer-based stuff? */
-    return result;
+    /* Now we fall-through and do the timer-based stuff, since we don't want
+       to force the user to have to deal with timeouts as long as at least one
+       connection in fact has traffic. */
   }
 
   /*