aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2010-12-08 11:59:47 +0000
committerSamuel Ortiz <sameo@linux.intel.com>2010-12-10 12:50:58 +0100
commit907300506b6fadad21363df1a1ef0b01f4906e52 (patch)
treec8f3f21cc09a12434aae3c229df4351984d9ca4c
parent7e64b827a2763d74814f81be03ccca350bb2cc3b (diff)
downloadpacrunner-907300506b6fadad21363df1a1ef0b01f4906e52.tar.gz
curl: Use curl_multi_socket_action() for timeout callback
... instead of curl_multi_socket_all(), which is deprecated and doesn't quite work right.
-rw-r--r--plugins/curl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/curl.c b/plugins/curl.c
index 376cbc9..a0c743e 100644
--- a/plugins/curl.c
+++ b/plugins/curl.c
@@ -209,8 +209,9 @@ static gboolean timeout_callback(gpointer user_data)
timeout_source = 0;
do {
- result = curl_multi_socket_all(multi, &handles);
- DBG("curl_multi_socket_all returns %d", result);
+ result = curl_multi_socket_action(multi, CURL_SOCKET_TIMEOUT,
+ 0, &handles);
+ DBG("curl_multi_socket_action returns %d", result);
} while (result == CURLM_CALL_MULTI_SOCKET);
check_sockets(multi, result, handles);