diff options
| author | Íñigo Huguet <inigohuguet@hotmail.com> | 2023-10-25 10:10:06 +0000 |
|---|---|---|
| committer | Íñigo Huguet <inigohuguet@hotmail.com> | 2023-10-25 10:10:06 +0000 |
| commit | 56b1a2c06a8236a11d2203df9fbe71c2eb52debf (patch) | |
| tree | e19054b15c04fdb4082193db140b0359ce5f1df8 | |
| parent | 8316eb0303802f6bd9b7a8ed9786ea0251e18cac (diff) | |
| parent | abc6e1cf258ab332bed161036a358bbe9c2d1e90 (diff) | |
merge: branch 'ishitatsuyuki-main-patch-08142'
connectivity: Make curl timeout callback non-repeating.
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1756
| -rw-r--r-- | src/core/nm-connectivity.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c index 92de44f17d..d8b0004c38 100644 --- a/src/core/nm-connectivity.c +++ b/src/core/nm-connectivity.c @@ -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 |