libcurl: update to 8.13.0

1 files changed, 13 insertions, 9 deletions

diff --git a/libs/libcurl/src/multihandle.h b/libs/libcurl/src/multihandle.h
index 410bf3f53f..1bf77b7822 100644
--- a/libs/libcurl/src/multihandle.h
+++ b/libs/libcurl/src/multihandle.h
@@ -27,10 +27,13 @@
 #include "llist.h"

 #include "hash.h"

 #include "conncache.h"

+#include "cshutdn.h"

+#include "multi_ev.h"

 #include "psl.h"

 #include "socketpair.h"

 

 struct connectdata;

+struct Curl_easy;

 

 struct Curl_message {

   struct Curl_llist_node list;

@@ -38,9 +41,9 @@ struct Curl_message {
   struct CURLMsg extmsg;

 };

 

-/* NOTE: if you add a state here, add the name to the statename[] array as

-   well!

-*/

+/* NOTE: if you add a state here, add the name to the statenames[] array

+ * in curl_trc.c as well!

+ */

 typedef enum {

   MSTATE_INIT,         /* 0 - start in this state */

   MSTATE_PENDING,      /* 1 - no connections, waiting for one */

@@ -98,6 +101,8 @@ struct Curl_multi {
   struct Curl_llist msgsent; /* in MSGSENT */

   curl_off_t next_easy_mid; /* next multi-id for easy handle added */

 

+  struct Curl_easy *admin; /* internal easy handle for admin operations */

+

   /* callback function and user data pointer for the *socket() API */

   curl_socket_callback socket_cb;

   void *socket_userp;

@@ -128,10 +133,9 @@ struct Curl_multi {
   char *xfer_sockbuf; /* the actual buffer */

   size_t xfer_sockbuf_len; /* the allocated length */

 

-  /* 'sockhash' is the lookup hash for socket descriptor => easy handles (note

-     the pluralis form, there can be more than one easy handle waiting on the

-     same actual socket) */

-  struct Curl_hash sockhash;

+  /* multi event related things */

+  struct curl_multi_ev ev;

+

   /* `proto_hash` is a general key-value store for protocol implementations

    * with the lifetime of the multi handle. The number of elements kept here

    * should be in the order of supported protocols (and sub-protocols like

@@ -140,8 +144,8 @@ struct Curl_multi {
    * the multi handle is cleaned up (see Curl_hash_add2()).*/

   struct Curl_hash proto_hash;

 

-  /* Shared connection cache (bundles)*/

-  struct cpool cpool;

+  struct cshutdn cshutdn; /* connection shutdown handling */

+  struct cpool cpool;     /* connection pool (bundles) */

 

   long max_host_connections; /* if >0, a fixed limit of the maximum number

                                 of connections per host */