From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 16 Mar 2023 17:11:44 +0000 (+0100)
Subject: lib2305: deal with CURLE_AGAIN
X-Git-Tag: curl-8_0_0~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f24014c3ebe300b8258b5e84efe207dd861829f5;p=thirdparty%2Fcurl.git

lib2305: deal with CURLE_AGAIN

The test does a slightly ugly busy-loop for this case but should be
managable due to it likely being a very short moment.

Mention CURLE_AGAIN in curl_ws_recv.3

Fixes #10760
Reported-by: Jay Satiro
Closes #10781
---

diff --git a/docs/libcurl/curl_ws_recv.3 b/docs/libcurl/curl_ws_recv.3
index 5c31367bb6..487027145e 100644
--- a/docs/libcurl/curl_ws_recv.3
+++ b/docs/libcurl/curl_ws_recv.3
@@ -59,6 +59,10 @@ Added in 7.86.0.
 Returns \fBCURLE_OK\fP if everything is okay, and a non-zero number for
 errors. Returns \fBCURLE_GOT_NOTHING\fP if the associated connection is
 closed.
+
+Instead of blocking, the function returns \fBCURLE_AGAIN\fP. The correct
+behavior is then to wait for the socket to signal readability before calling
+this function again.
 .SH "SEE ALSO"
 .BR curl_easy_setopt "(3), " curl_easy_perform "(3), "
 .BR curl_easy_getinfo "(3), "
diff --git a/tests/libtest/lib2305.c b/tests/libtest/lib2305.c
index 8642ed2794..ebf9bcdbbb 100644
--- a/tests/libtest/lib2305.c
+++ b/tests/libtest/lib2305.c
@@ -52,6 +52,9 @@ static void websocket(CURL *curl)
     CURLcode result =
       curl_ws_recv(curl, buffer, sizeof(buffer), &nread, &meta);
     if(result) {
+      if(result == CURLE_AGAIN)
+        /* crude busy-loop */
+        continue;
       printf("curl_ws_recv returned %d\n", (int)result);
       return;
     }