6a6cb92d31
resolves: rhbz#2228131 Rebase to 1.34.2 resolves: rhbz#2168629
37 lines
1014 B
Diff
37 lines
1014 B
Diff
From 173530071d11433e26e1be1c11bc0e474f18079b Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Fri, 28 Jul 2023 14:35:42 +0100
|
|
Subject: [PATCH] curl: Do pool_unload before config_unload
|
|
|
|
Since config.c deals with handles (and contains free_handle), and
|
|
since pool_unload calls free_handle to free handles, it's better to do
|
|
pool_unload first.
|
|
|
|
I don't believe this is a correctness issue now, but it will be in
|
|
subsequent commits.
|
|
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
(cherry picked from commit 650bde3bdb85ff2af0ea618fd64e726b7535d686)
|
|
---
|
|
plugins/curl/curl.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/plugins/curl/curl.c b/plugins/curl/curl.c
|
|
index 4e727b86..be42de36 100644
|
|
--- a/plugins/curl/curl.c
|
|
+++ b/plugins/curl/curl.c
|
|
@@ -84,9 +84,9 @@ curl_after_fork (void)
|
|
static void
|
|
curl_unload (void)
|
|
{
|
|
+ pool_unload ();
|
|
config_unload ();
|
|
scripts_unload ();
|
|
- pool_unload ();
|
|
display_times ();
|
|
curl_global_cleanup ();
|
|
}
|
|
--
|
|
2.39.3
|
|
|