libcurl: update to 8.13.0

1 files changed, 10 insertions, 5 deletions

diff --git a/libs/libcurl/src/select.c b/libs/libcurl/src/select.c
index e4e66e17d2..ba8c00153d 100644
--- a/libs/libcurl/src/select.c
+++ b/libs/libcurl/src/select.c
@@ -74,7 +74,7 @@ int Curl_wait_ms(timediff_t timeout_ms)
   if(!timeout_ms)

     return 0;

   if(timeout_ms < 0) {

-    SET_SOCKERRNO(EINVAL);

+    SET_SOCKERRNO(SOCKEINVAL);

     return -1;

   }

 #if defined(MSDOS)

@@ -86,7 +86,7 @@ int Curl_wait_ms(timediff_t timeout_ms)
     timeout_ms = ULONG_MAX-1;

     /* do not use ULONG_MAX, because that is equal to INFINITE */

 #endif

-  Sleep((ULONG)timeout_ms);

+  Sleep((DWORD)timeout_ms);

 #else

   /* avoid using poll() for this since it behaves incorrectly with no sockets

      on Apple operating systems */

@@ -96,7 +96,7 @@ int Curl_wait_ms(timediff_t timeout_ms)
   }

 #endif /* _WIN32 */

   if(r) {

-    if((r == -1) && (SOCKERRNO == EINTR))

+    if((r == -1) && (SOCKERRNO == SOCKEINTR))

       /* make EINTR from select or poll not a "lethal" error */

       r = 0;

     else

@@ -312,7 +312,7 @@ int Curl_poll(struct pollfd ufds[], unsigned int nfds, timediff_t timeout_ms)
     pending_ms = 0;

   r = poll(ufds, nfds, pending_ms);

   if(r <= 0) {

-    if((r == -1) && (SOCKERRNO == EINTR))

+    if((r == -1) && (SOCKERRNO == SOCKEINTR))

       /* make EINTR from select or poll not a "lethal" error */

       r = 0;

     return r;

@@ -360,7 +360,7 @@ int Curl_poll(struct pollfd ufds[], unsigned int nfds, timediff_t timeout_ms)
   */

   r = our_select(maxfd, &fds_read, &fds_write, &fds_err, timeout_ms);

   if(r <= 0) {

-    if((r == -1) && (SOCKERRNO == EINTR))

+    if((r == -1) && (SOCKERRNO == SOCKEINTR))

       /* make EINTR from select or poll not a "lethal" error */

       r = 0;

     return r;

@@ -410,6 +410,11 @@ void Curl_pollfds_init(struct curl_pollfds *cpfds,
   }

 }

 

+void Curl_pollfds_reset(struct curl_pollfds *cpfds)

+{

+  cpfds->n = 0;

+}

+

 void Curl_pollfds_cleanup(struct curl_pollfds *cpfds)

 {

   DEBUGASSERT(cpfds);