1 files changed, 13 insertions, 20 deletions

diff --git a/libs/libcurl/src/multiif.h b/libs/libcurl/src/multiif.h
index acabdee604..d70a4549fd 100644
--- a/libs/libcurl/src/multiif.h
+++ b/libs/libcurl/src/multiif.h
@@ -28,8 +28,10 @@
  * Prototypes for library-wide functions provided by multi.c

  */

 

-CURLcode Curl_updatesocket(struct Curl_easy *data);

 void Curl_expire(struct Curl_easy *data, timediff_t milli, expire_id);

+void Curl_expire_ex(struct Curl_easy *data,

+                    const struct curltime *nowp,

+                    timediff_t milli, expire_id id);

 bool Curl_expire_clear(struct Curl_easy *data);

 void Curl_expire_done(struct Curl_easy *data, expire_id id);

 CURLMcode Curl_update_timer(struct Curl_multi *multi) WARN_UNUSED_RESULT;

@@ -64,26 +66,13 @@ struct Curl_multi *Curl_multi_handle(size_t hashsize,
 /* mask for checking if read and/or write is set for index x */

 #define GETSOCK_MASK_RW(x) (GETSOCK_READSOCK(x)|GETSOCK_WRITESOCK(x))

 

-/*

- * Curl_multi_closed()

- *

- * Used by the connect code to tell the multi_socket code that one of the

- * sockets we were using is about to be closed. This function will then

- * remove it from the sockethash for this handle to make the multi_socket API

- * behave properly, especially for the case when libcurl will create another

- * socket again and it gets the same file descriptor number.

- */

-

-void Curl_multi_closed(struct Curl_easy *data, curl_socket_t s);

-

-/* Compare the two pollsets to notify the multi_socket API of changes

- * in socket polling, e.g calling multi->socket_cb() with the changes if

- * differences are seen.

+/**

+ * Let the multi handle know that the socket is about to be closed.

+ * The multi will then remove anything it knows about the socket, so

+ * when the OS is using this socket (number) again subsequently,

+ * the internal book keeping will not get confused.

  */

-CURLMcode Curl_multi_pollset_ev(struct Curl_multi *multi,

-                                struct Curl_easy *data,

-                                struct easy_pollset *ps,

-                                struct easy_pollset *last_ps);

+void Curl_multi_will_close(struct Curl_easy *data, curl_socket_t s);

 

 /*

  * Add a handle and move it into PERFORM state at once. For pushed streams.

@@ -96,6 +85,10 @@ CURLMcode Curl_multi_add_perform(struct Curl_multi *multi,
 /* Return the value of the CURLMOPT_MAX_CONCURRENT_STREAMS option */

 unsigned int Curl_multi_max_concurrent_streams(struct Curl_multi *multi);

 

+void Curl_multi_getsock(struct Curl_easy *data,

+                        struct easy_pollset *ps,

+                        const char *caller);

+

 /**

  * Borrow the transfer buffer from the multi, suitable

  * for the given transfer `data`. The buffer may only be used in one