NetworkManager-1.46.0
This commit is contained in:
@@ -1,42 +0,0 @@
|
||||
From abc6e1cf258ab332bed161036a358bbe9c2d1e90 Mon Sep 17 00:00:00 2001
|
||||
From: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
|
||||
Date: Fri, 13 Oct 2023 16:46:09 +0000
|
||||
Subject: [PATCH] connectivity: Make curl timeout callback non-repeating.
|
||||
|
||||
This reverts commit 05c31da4d9.
|
||||
|
||||
In the linked commit the callback was made repeating on the assumption
|
||||
that forward progress would result in the callback getting canceled in
|
||||
cb_data_complete. However, this assumption does not hold since a timeout
|
||||
callback does not guarantee completion (or error out) of a request.
|
||||
|
||||
curl tweaked some internals in v8.4.0 and started giving 0 timeouts, and
|
||||
a repeating callback is firing back-to-back without making any progress
|
||||
in doing so.
|
||||
|
||||
Revert the change and make the callback non-repeating again.
|
||||
|
||||
Fixes: 05c31da4d9cb ('connectivity: don't cancel curl timerfunction from timeout')
|
||||
---
|
||||
src/core/nm-connectivity.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
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
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
<Icon>NetworkManager</Icon>
|
||||
<Summary>Network connection manager powered by D-Bus and UDEV</Summary>
|
||||
<Description>NetworkManager attempts to keep an active network connection available at all times.</Description>
|
||||
<Archive sha1sum="6dcfdf23e5fa86d3fb627c948ddd62c63ea95728" type="tarxz">https://download.gnome.org/sources/NetworkManager/1.44/NetworkManager-1.44.2.tar.xz</Archive>
|
||||
<Archive sha1sum="3c11d700a2e81a7abce285ab94d015ac966f59d3" type="tarxz">https://download.gnome.org/sources/NetworkManager/1.46/NetworkManager-1.46.0.tar.xz</Archive>
|
||||
<AdditionalFiles>
|
||||
<!-- <AdditionalFile target="po/tr.po">tr.po</AdditionalFile> -->
|
||||
</AdditionalFiles>
|
||||
<BuildDependencies>
|
||||
<Dependency>meson</Dependency>
|
||||
<Dependency>audit-devel</Dependency>
|
||||
<Dependency>audit-devel</Dependency>
|
||||
<Dependency>curl-devel</Dependency>
|
||||
<Dependency>intltool</Dependency>
|
||||
<Dependency>dhclient</Dependency>
|
||||
@@ -62,7 +62,7 @@
|
||||
<Dependency>gobject-introspection-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch>abc6e1cf.patch</Patch>
|
||||
<!-- <Patch>abc6e1cf.patch</Patch> -->
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -160,6 +160,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="41">
|
||||
<Date>2024-02-23</Date>
|
||||
<Version>1.46.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="40">
|
||||
<Date>2023-11-02</Date>
|
||||
<Version>1.44.2</Version>
|
||||
|
||||
Reference in New Issue
Block a user