]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
multi.c: make stronger check for paused transfer before asserting
authorStefan Eissing <stefan@eissing.org>
Fri, 20 Sep 2024 13:58:21 +0000 (15:58 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Fri, 20 Sep 2024 15:01:34 +0000 (17:01 +0200)
With higher parallelism in CI, the ASSERT triggered on pause tests.
Strengthen the check. We might want to think about removing
KEEP_RECV_PAUSE|KEEP_SEND_PAUSE altogether.

Closes #14981

lib/multi.c

index 6d2c3922edf3989943ad4f8de433c4bb6e55173e..d4097d24e53483411c5f4641822352dcae2b8fa0 100644 (file)
@@ -1126,6 +1126,7 @@ static void multi_getsock(struct Curl_easy *data,
 
   if(expect_sockets && !ps->num &&
      !(data->req.keepon & (KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) &&
+     !Curl_cwriter_is_paused(data) && !Curl_creader_is_paused(data) &&
      Curl_conn_is_ip_connected(data, FIRSTSOCKET)) {
     infof(data, "WARNING: no socket in pollset, transfer may stall!");
     DEBUGASSERT(0);