From: Stefan Eissing <stefan@eissing.org>
Date: Fri, 20 Sep 2024 13:58:21 +0000 (+0200)
Subject: multi.c: make stronger check for paused transfer before asserting
X-Git-Tag: curl-8_11_0~398
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b20ac93f41c7a05168586a78071264e4210cd67f;p=thirdparty%2Fcurl.git

multi.c: make stronger check for paused transfer before asserting

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
---

diff --git a/lib/multi.c b/lib/multi.c
index 6d2c3922ed..d4097d24e5 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -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);