merge: branch 'ishitatsuyuki-main-patch-08142'

connectivity: Make curl timeout callback non-repeating.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1756
This commit is contained in:
Íñigo Huguet 2023-10-25 10:10:06 +00:00
commit 56b1a2c06a

View file

@ -406,9 +406,10 @@ _con_curl_timeout_cb(gpointer user_data)
{
NMConnectivityCheckHandle *cb_data = user_data;
cb_data->concheck.curl_timer = 0;
_con_curl_check_connectivity(cb_data->concheck.curl_mhandle, CURL_SOCKET_TIMEOUT, 0);
_complete_queued(cb_data->self);
return G_SOURCE_CONTINUE;
return G_SOURCE_REMOVE;
}
static int