diff options
| author | Antonio Cardace <acardace@redhat.com> | 2020-06-18 18:26:59 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-08-04 23:49:37 +0200 |
| commit | 92bded74c4e512314e318ac1287208ac1de5a9a3 (patch) | |
| tree | a48884400877a8e1cd9c6abfc4c1fe5169f1ef3c | |
| parent | fe3ddf3effc2b2e9792fa448de27514dbc0b1409 (diff) | |
| download | NetworkManager-92bded74c4e512314e318ac1287208ac1de5a9a3.tar.gz | |
nmcs-http: remove the timeout once expired
libcurl's documentation for CURLMOPT_TIMERFUNCTION requires the
application to install a non-repeating timer.
https://curl.haxx.se/libcurl/c/CURLMOPT_TIMERFUNCTION.html
So let's remove the GSource once expired.
Fixes: 69f048bf0ca3 ('cloud-setup: add tool for automatic IP configuration in cloud')
(cherry picked from commit e09bd2339a224a13067b0adcf9cb84a4f13ef003)
(cherry picked from commit b7d53f0d3a7fcec3e5b8ebce477750cd8ef9d166)
| -rw-r--r-- | clients/cloud-setup/nm-http-client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clients/cloud-setup/nm-http-client.c b/clients/cloud-setup/nm-http-client.c index 16dbd5bbe0..817f0e2eba 100644 --- a/clients/cloud-setup/nm-http-client.c +++ b/clients/cloud-setup/nm-http-client.c @@ -657,7 +657,7 @@ static gboolean _mhandle_timeout_cb (gpointer user_data) { _mhandle_action (user_data, CURL_SOCKET_TIMEOUT, 0); - return G_SOURCE_CONTINUE; + return G_SOURCE_REMOVE; } static int |