Change curl multi get handles, not available on all versions

Author: davidtrihy-genesys

modules/rest_client/rest_methods.c

@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <curl/curl.h>
+#include <curl/multi.h>
 
 #include "../../mem/shm_mem.h"
 #include "../../async.h"
@@ -1569,10 +1570,11 @@ int connect_only(preconnect_urls *precon_urls, int total_cons) {
 	CURLM *multi_handle;
 	OSS_CURLM *multi_list;
 	CURL **list;
+	struct CURLMsg *m;
 	preconnect_urls *start, *next;
 	char *url;
 	long busy_wait, timer;
-	int num_of_connections, exit_code = 0;
+	int msgq, num_of_connections, exit_code = 0;
 
 	curl_share = get_curl_share();
 
@@ -1645,19 +1647,18 @@ int connect_only(preconnect_urls *precon_urls, int total_cons) {
 		usleep(1000UL * busy_wait);
 		LM_DBG("Creating warm pool connection, running handles %d\n", running_handles);
 	} while (running_handles != 0);
+
 cleanup:
-	list = (CURL **) curl_multi_get_handles(multi_handle);
- 
-	if (list) {
-		for (int i = 0; list[i]; i++) {
-			get_easy_status(list[i], multi_handle, &rc);
-			mrc = curl_multi_remove_handle(multi_handle, list[i]);
+	do {
+		m = curl_multi_info_read(multi_handle, &msgq);
+		if (m && m->msg == CURLMSG_DONE) {
+			mrc = curl_multi_remove_handle(multi_handle, m->easy_handle);
 			if (mrc != CURLM_OK) {
 				LM_ERR("curl_multi_remove_handle: %s\n", curl_multi_strerror(mrc));
 			}
-			curl_easy_cleanup(list[i]);
+			curl_easy_cleanup(m->easy_handle);
 		}
-	}
+	} while (m);
 
 	start = precon_urls;