oops, the previous commit was incomplete as we made an unconditional call

to multi_runsingle() without it being really necessary or good

diff --git a/lib/multi.c b/lib/multi.c
index 4e6efecd16cd4db323bcbee21c3f30dd70de6d35..d822bda52140b5150dc740579eab0909d8ea72d9 100644 (file)
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -1206,6 +1206,9 @@ static CURLMcode multi_socket(struct Curl_multi *multi,
     /* 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. */
+
+    data = NULL; /* set data to NULL again to avoid calling multi_runsingle()
+                    in case there's no need to */
   }
 
   /*