gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnurl] 188/411: pause: only trigger a reread if the unpause sticks


From: gnunet
Subject: [gnurl] 188/411: pause: only trigger a reread if the unpause sticks
Date: Wed, 13 Jan 2021 01:20:03 +0100

This is an automated email from the git hooks/post-receive script.

nikita pushed a commit to branch master
in repository gnurl.

commit 7772344e17939e86879b57b4833d56b8beadd927
Author: Daniel Stenberg <daniel@haxx.se>
AuthorDate: Fri Sep 25 09:45:35 2020 +0200

    pause: only trigger a reread if the unpause sticks
    
    As an unpause might itself get paused again and then triggering another
    reread doesn't help.
    
    Follow-up from e040146f22608fd9 (shipped since 7.69.1)
    
    Bug: https://curl.haxx.se/mail/lib-2020-09/0081.html
    Patch-by: Kunal Chandarana
    Fixes #5988
    Closes #6013
---
 lib/easy.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/easy.c b/lib/easy.c
index 453859d44..60e2befd7 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -1067,9 +1067,10 @@ CURLcode curl_easy_pause(struct Curl_easy *data, int 
action)
      (KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) {
     Curl_expire(data, 0, EXPIRE_RUN_NOW); /* get this handle going again */
 
-    /* force a recv/send check of this connection, as the data might've been
-       read off the socket already */
-    data->conn->cselect_bits = CURL_CSELECT_IN | CURL_CSELECT_OUT;
+    if(!data->state.tempcount)
+      /* if not pausing again, force a recv/send check of this connection as
+         the data might've been read off the socket already */
+      data->conn->cselect_bits = CURL_CSELECT_IN | CURL_CSELECT_OUT;
     if(data->multi)
       Curl_update_timer(data->multi);
   }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]