diff --git a/0001-tests-test-connect.c-Skip-if-exit-with-parent-is-not.patch b/0001-tests-test-connect.c-Skip-if-exit-with-parent-is-not.patch
deleted file mode 100644
index 8acd9c9..0000000
--- a/0001-tests-test-connect.c-Skip-if-exit-with-parent-is-not.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 41775572a5beb8ae49287271af31264684b2bbe3 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Fri, 21 Jul 2023 19:00:31 +0100
-Subject: [PATCH] tests/test-connect.c: Skip if --exit-with-parent is not
- supported
-
-Fixes: commit 933d7401ff623077ba43b4ef1e7f16a7864c5fde
-(cherry picked from commit 59664b8b146edcba0353de628528e0a2035b3ba7)
----
- tests/test-connect.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/tests/test-connect.c b/tests/test-connect.c
-index f463415b..d7118330 100644
---- a/tests/test-connect.c
-+++ b/tests/test-connect.c
-@@ -47,6 +47,13 @@ main (int argc, char *argv[])
-   struct nbd_handle *nbd;
-   int64_t size;
- 
-+  if (system ("nbdkit --exit-with-parent --version") != 0) {
-+    printf ("%s: --exit-with-parent is not implemented on this platform, "
-+            "skipping\n",
-+            argv[0]);
-+    exit (77);
-+  }
-+
-   nbd = nbd_create ();
-   if (nbd == NULL) {
-     fprintf (stderr, "%s\n", nbd_get_error ());
--- 
-2.39.3
-
diff --git a/0002-tests-Use-exit-with-parent-in-the-test-framework.patch b/0002-tests-Use-exit-with-parent-in-the-test-framework.patch
deleted file mode 100644
index 367eddb..0000000
--- a/0002-tests-Use-exit-with-parent-in-the-test-framework.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 93a2c7321dc5ccd36368d50887cf239cfb883a72 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Fri, 21 Jul 2023 19:01:35 +0100
-Subject: [PATCH] tests: Use --exit-with-parent in the test framework
-
-Make sure nbdkit always exits, in case some other part of the test is
-killed.
-
-(cherry picked from commit c6299889e80217cfadf488a67961be9eb6d24e38)
----
- tests/Makefile.am |  2 ++
- tests/test.c      | 22 +++++++++++++---------
- 2 files changed, 15 insertions(+), 9 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index e1087689..f6c5ac9a 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -594,6 +594,8 @@ EXTRA_DIST += \
- check_LTLIBRARIES += libtest.la
- libtest_la_SOURCES = test.c test.h
- libtest_la_CFLAGS = $(WARNINGS_CFLAGS)
-+libtest_la_CPPFLAGS = -I$(top_srcdir)/common/utils
-+libtest_la_LIBADD = $(top_builddir)/common/utils/libutils.la
- 
- # Basic connection test.
- LIBNBD_TESTS += test-connect
-diff --git a/tests/test.c b/tests/test.c
-index 67f69fab..6be10f12 100644
---- a/tests/test.c
-+++ b/tests/test.c
-@@ -50,6 +50,8 @@
- #include <sys/wait.h>
- #endif
- 
-+#include "exit-with-parent.h"
-+
- #include "test.h"
- 
- #ifndef WIN32
-@@ -161,15 +163,17 @@ test_start_nbdkit (const char *arg, ...)
-     const char *argv[MAX_ARGS+1];
-     va_list args;
- 
--    argv[0] = "nbdkit";
--    argv[1] = "-U";
--    argv[2] = kit->sockpath;
--    argv[3] = "-P";
--    argv[4] = kit->pidpath;
--    argv[5] = "-f";
--    argv[6] = "-v";
--    argv[7] = arg;
--    i = 8;
-+    i = 0;
-+    argv[i++] = "nbdkit";
-+    argv[i++] = "-U";
-+    argv[i++] = kit->sockpath;
-+    argv[i++] = "-P";
-+    argv[i++] = kit->pidpath;
-+    argv[i++] = "-f";
-+    argv[i++] = "-v";
-+    if (can_exit_with_parent ())
-+      argv[i++] = "--exit-with-parent";
-+    argv[i++] = arg;
- 
-     va_start (args, arg);
-     while ((p = va_arg (args, const char *)) != NULL) {
--- 
-2.39.3
-
diff --git a/0003-protect-Fix-copy-and-paste-error-in-the-documentatio.patch b/0003-protect-Fix-copy-and-paste-error-in-the-documentatio.patch
deleted file mode 100644
index 41608e4..0000000
--- a/0003-protect-Fix-copy-and-paste-error-in-the-documentatio.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e3a62ebad571d6512501941c49f7a8ab66ef5646 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Sat, 22 Jul 2023 09:50:44 +0100
-Subject: [PATCH] protect: Fix copy and paste error in the documentation
-
-(cherry picked from commit f04607c95c27c4342f41d083ad00ac02c579b391)
----
- filters/protect/nbdkit-protect-filter.pod | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/filters/protect/nbdkit-protect-filter.pod b/filters/protect/nbdkit-protect-filter.pod
-index b5ffc7ca..aad72a68 100644
---- a/filters/protect/nbdkit-protect-filter.pod
-+++ b/filters/protect/nbdkit-protect-filter.pod
-@@ -102,7 +102,7 @@ Use C<nbdkit --dump-config> to find the location of C<$filterdir>.
- 
- =head1 VERSION
- 
--C<nbdkit-offset-filter> first appeared in nbdkit 1.30.
-+C<nbdkit-protect-filter> first appeared in nbdkit 1.30.
- 
- =head1 SEE ALSO
- 
--- 
-2.39.3
-
diff --git a/0004-docs-nbdkit-protocol.pod-Fix-manual-page-name.patch b/0004-docs-nbdkit-protocol.pod-Fix-manual-page-name.patch
deleted file mode 100644
index f568fc9..0000000
--- a/0004-docs-nbdkit-protocol.pod-Fix-manual-page-name.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c6da52fd3d9a9e5e8ad4648bba686c37b5d3fae7 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Sun, 23 Jul 2023 20:15:23 +0100
-Subject: [PATCH] docs/nbdkit-protocol.pod: Fix manual page name
-
-Updates: commit dce32051318c3e8bd20825cc0db5df15f95d11fa
-(cherry picked from commit 00aa248cec0a64ca293bbedffbf47426ee2b2340)
----
- docs/nbdkit-protocol.pod | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/nbdkit-protocol.pod b/docs/nbdkit-protocol.pod
-index 7e89a607..dabdf23c 100644
---- a/docs/nbdkit-protocol.pod
-+++ b/docs/nbdkit-protocol.pod
-@@ -1,6 +1,6 @@
- =head1 NAME
- 
--nbdkit - which parts of the NBD protocol nbdkit supports
-+nbdkit-protocol - which parts of the NBD protocol nbdkit supports
- 
- =head1 SYNOPSIS
- 
--- 
-2.39.3
-
diff --git a/0005-retry-request-Print-operation-we-are-retrying-in-deb.patch b/0005-retry-request-Print-operation-we-are-retrying-in-deb.patch
deleted file mode 100644
index 0ff2d65..0000000
--- a/0005-retry-request-Print-operation-we-are-retrying-in-deb.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From e206e3a645ee6d350df210d2ef95614d3f5d97e7 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Fri, 28 Jul 2023 16:43:07 +0100
-Subject: [PATCH] retry-request: Print operation we are retrying in debug
- messages
-
-Reviewed-by: Eric Blake <eblake@redhat.com>
-(cherry picked from commit dbc91fd2eac5eac77293e3deded92e11c0b8d6e3)
----
- filters/retry-request/retry-request.c | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/filters/retry-request/retry-request.c b/filters/retry-request/retry-request.c
-index ed566080..e5b8344c 100644
---- a/filters/retry-request/retry-request.c
-+++ b/filters/retry-request/retry-request.c
-@@ -100,15 +100,15 @@ retry_request_config (nbdkit_next_config *next, nbdkit_backend *nxdata,
-  * The code between RETRY_START...RETRY_END must set r to 0 or -1 on
-  * success or failure.  *err may also be implicitly assigned.
-  */
--#define RETRY_START                                                     \
-+#define RETRY_START(what)                                               \
-   {                                                                     \
-     unsigned i;                                                         \
-                                                                         \
-     r = -1;                                                             \
-     for (i = 0; r == -1 && i <= retries; ++i) {                         \
-       if (i > 0) {                                                      \
--        nbdkit_debug ("retry %u: waiting %u seconds before retrying",   \
--                      i, delay);                                        \
-+        nbdkit_debug ("retry %u: waiting %u seconds before retrying %s",\
-+                      i, delay, what);                                  \
-         if (nbdkit_nanosleep (delay, 0) == -1) {                        \
-           if (*err == 0)                                                \
-             *err = errno;                                               \
-@@ -130,7 +130,7 @@ retry_request_open (nbdkit_next_open *next, nbdkit_context *nxdata,
-   if (retry_open_call) {
-     int *err = &errno;          /* used by the RETRY_* macros */
- 
--    RETRY_START
-+    RETRY_START("open")
-       r = next (nxdata, readonly, exportname);
-     RETRY_END;
-   }
-@@ -148,7 +148,7 @@ retry_request_pread (nbdkit_next *next,
- {
-   int r;
- 
--  RETRY_START
-+  RETRY_START("pread")
-     r = next->pread (next, buf, count, offset, flags, err);
-   RETRY_END;
-   return r;
-@@ -162,7 +162,7 @@ retry_request_pwrite (nbdkit_next *next,
- {
-   int r;
- 
--  RETRY_START
-+  RETRY_START("pwrite")
-     r = next->pwrite (next, buf, count, offset, flags, err);
-   RETRY_END;
-   return r;
-@@ -176,7 +176,7 @@ retry_request_trim (nbdkit_next *next,
- {
-   int r;
- 
--  RETRY_START
-+  RETRY_START("trim")
-     r = next->trim (next, count, offset, flags, err);
-   RETRY_END;
-   return r;
-@@ -189,7 +189,7 @@ retry_request_flush (nbdkit_next *next,
- {
-   int r;
- 
--  RETRY_START
-+  RETRY_START("flush")
-     r = next->flush (next, flags, err);
-   RETRY_END;
-   return r;
-@@ -203,7 +203,7 @@ retry_request_zero (nbdkit_next *next,
- {
-   int r;
- 
--  RETRY_START
-+  RETRY_START("zero")
-     r = next->zero (next, count, offset, flags, err);
-   RETRY_END;
-   return r;
-@@ -218,7 +218,7 @@ retry_request_extents (nbdkit_next *next,
-   CLEANUP_EXTENTS_FREE struct nbdkit_extents *extents2 = NULL;
-   int r;
- 
--  RETRY_START {
-+  RETRY_START("extents") {
-     /* Each retry must begin with extents reset to the right beginning. */
-     nbdkit_extents_free (extents2);
-     extents2 = nbdkit_extents_new (offset, next->get_size (next));
-@@ -254,7 +254,7 @@ retry_request_cache (nbdkit_next *next,
- {
-   int r;
- 
--  RETRY_START
-+  RETRY_START("cache")
-     r = next->cache (next, count, offset, flags, err);
-   RETRY_END;
-   return r;
--- 
-2.39.3
-
diff --git a/0006-tests-test-ocaml-errorcodes.c-Don-t-use-assert-in-te.patch b/0006-tests-test-ocaml-errorcodes.c-Don-t-use-assert-in-te.patch
deleted file mode 100644
index 64f4dcd..0000000
--- a/0006-tests-test-ocaml-errorcodes.c-Don-t-use-assert-in-te.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From fdd27622047cd8e25af33b66a57899b75e99db82 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 1 Aug 2023 11:42:58 +0100
-Subject: [PATCH] tests/test-ocaml-errorcodes.c: Don't use assert in test
-
-exit with EXIT_FAILURE instead, as the program might be compiled with
--DNDEBUG.
-
-(cherry picked from commit 678410e23841376d8b742dce3d10c632499367a2)
----
- tests/test-ocaml-errorcodes.c | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/tests/test-ocaml-errorcodes.c b/tests/test-ocaml-errorcodes.c
-index e59f074b..8ab7e0ae 100644
---- a/tests/test-ocaml-errorcodes.c
-+++ b/tests/test-ocaml-errorcodes.c
-@@ -34,8 +34,9 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
-+#include <inttypes.h>
- #include <errno.h>
--#include <assert.h>
- 
- #include <libnbd.h>
- 
-@@ -84,10 +85,19 @@ main (int argc, char *argv[])
-     exit (EXIT_FAILURE);
-   }
- 
--  assert (nbd_pread (nbd, buf, 512, 0, 0) == 0);
-+  if (nbd_pread (nbd, buf, 512, 0, 0) == -1) {
-+    fprintf (stderr, "%s: FAIL: did not expect reading sector 0 to fail\n",
-+             argv[0]);
-+    exit (EXIT_FAILURE);
-+  }
- 
-   for (i = 0; tests[i].offset != 0; ++i) {
--    assert (nbd_pread (nbd, buf, 512, tests[i].offset, 0) == -1);
-+    if (nbd_pread (nbd, buf, 512, tests[i].offset, 0) != -1) {
-+      fprintf (stderr,
-+               "%s: FAIL: reading sector %" PRIu64 "should have failed\n",
-+               argv[0], tests[i].offset / 512);
-+      exit (EXIT_FAILURE);
-+    }
-     actual_errno = nbd_get_errno ();
-     if (actual_errno != tests[i].expected_errno) {
-       fprintf (stderr, "%s: FAIL: actual errno = %d expected errno = %d\n",
--- 
-2.39.3
-
diff --git a/0007-tests-test-ocaml-errorcodes.c-Enable-verbose-message.patch b/0007-tests-test-ocaml-errorcodes.c-Enable-verbose-message.patch
deleted file mode 100644
index 2f54ddd..0000000
--- a/0007-tests-test-ocaml-errorcodes.c-Enable-verbose-message.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From eca5131cbbc7e1785b266cc92624a2ce9582a7cc Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 1 Aug 2023 12:42:05 +0100
-Subject: [PATCH] tests/test-ocaml-errorcodes.c: Enable verbose messages
-
-This test crashes when the OCaml plugin is unloaded (specifically when
-we call caml_acquire_runtime_system).  Enable verbose messages in a
-failed attempt to track down what is happening.
-
-(cherry picked from commit 99567408fdd8ea55b0bb5286b45ce135d91c38b5)
----
- tests/test-ocaml-errorcodes.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test-ocaml-errorcodes.c b/tests/test-ocaml-errorcodes.c
-index 8ab7e0ae..f84da3d8 100644
---- a/tests/test-ocaml-errorcodes.c
-+++ b/tests/test-ocaml-errorcodes.c
-@@ -78,7 +78,7 @@ main (int argc, char *argv[])
- 
-   if (nbd_connect_command (nbd,
-                            (char *[]) {
--                             "nbdkit", "-s", "--exit-with-parent",
-+                             "nbdkit", "-s", "--exit-with-parent", "-v",
-                              "./test-ocaml-errorcodes-plugin.so",
-                              NULL }) == -1) {
-     fprintf (stderr, "%s\n", nbd_get_error ());
--- 
-2.39.3
-
diff --git a/0008-curl-Use-the-parallel-thread-model.patch b/0008-curl-Use-the-parallel-thread-model.patch
deleted file mode 100644
index 9a670be..0000000
--- a/0008-curl-Use-the-parallel-thread-model.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From bfa0b1238f6318d06930ec4d389a27932fc90a16 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Sat, 4 Feb 2023 12:34:57 +0000
-Subject: [PATCH] curl: Use the parallel thread model
-
-After previous changes, it is now safe to use the parallel thread
-model in this plugin.  The locking in pool.c protects a single curl
-handle from being used from multiple threads.
-
-An advantage of this is we can now combine the curl plugin with
-filters such as readahead and scan.
-
-This pessimizes some workloads and improves others.  See my earlier
-comments here:
-
-  https://listman.redhat.com/archives/libguestfs/2023-February/030610.html
-  https://listman.redhat.com/archives/libguestfs/2023-February/030618.html
-  https://listman.redhat.com/archives/libguestfs/2023-February/030619.html
-  https://listman.redhat.com/archives/libguestfs/2023-February/030620.html
-
-Tests below use this basic command:
-
-  $ time nbdkit -r -U - curl https://cloud.debian.org/images/cloud/bookworm/daily/latest/debian-12-generic-amd64-daily.qcow2 \
-         --run '$COPY $uri /var/tmp/out'
-
-where $COPY is either nbdcopy or qemu-img convert.
-
-Before this change:
-
-  nbdkit + nbdcopy           0m55.397s
-  nbdkit + qemu-img convert  [over 20 minutes]
-
-After this change:
-
-  nbdkit + nbdcopy           1m1.235s
-  nbdkit + qemu-img convert  6m3.262s
-  nbdkit --filter=readahead --filter=cache + qemu-img convert
-                             8m16.488s
-  nbdkit connections=8 + qemu-img convert
-                             3m48.502s
-
-Previously [see first link above] we noted that file: URLs are
-impacted, and indeed they are, with this command:
-
-  $ time nbdkit -r -U - curl file:/var/tmp/fedora-36.img \
-         --run 'nbdcopy --no-extents -p "$uri" null:'
-
-nearly doubling in run-time (0.78 -> 1.34).  However I think this may
-be a peculiarity of curl's handling of file.  (Use nbdkit-file-plugin
-instead).
-
-Note the fundamental issue here is still lack of multiconn support in
-qemu's NBD client.
-
-(cherry picked from commit f2163754860d041c4cb12dace90591c280eccae8)
----
- plugins/curl/curl.c | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/plugins/curl/curl.c b/plugins/curl/curl.c
-index 58ffb662..425f1d90 100644
---- a/plugins/curl/curl.c
-+++ b/plugins/curl/curl.c
-@@ -537,12 +537,7 @@ curl_close (void *handle)
-   free (h);
- }
- 
--/* This plugin could support the parallel thread model.  It currently
-- * uses serialize_requests because parallel has the unfortunate effect
-- * of pessimising common workloads.  See:
-- * https://listman.redhat.com/archives/libguestfs/2023-February/030618.html
-- */
--#define THREAD_MODEL NBDKIT_THREAD_MODEL_SERIALIZE_REQUESTS
-+#define THREAD_MODEL NBDKIT_THREAD_MODEL_PARALLEL
- 
- /* Calls get_handle() ... put_handle() to get a handle for the length
-  * of the current scope.
--- 
-2.39.3
-
diff --git a/0009-curl-Add-ipresolve-option.patch b/0009-curl-Add-ipresolve-option.patch
deleted file mode 100644
index ddcebff..0000000
--- a/0009-curl-Add-ipresolve-option.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From a5f1e659d52872a499a5744870cb3e6ff382642f Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 25 Jul 2023 16:57:41 +0100
-Subject: [PATCH] curl: Add ipresolve option
-
-Allows you to force IPv4 or IPv6.
-
-(cherry picked from commit d1b27c97f7fac00ee452a1d1b05805ee7145a49c)
----
- plugins/curl/curl.c                 | 15 +++++++++++++++
- plugins/curl/curldefs.h             |  1 +
- plugins/curl/nbdkit-curl-plugin.pod | 14 ++++++++++++++
- plugins/curl/pool.c                 |  2 ++
- 4 files changed, 32 insertions(+)
-
-diff --git a/plugins/curl/curl.c b/plugins/curl/curl.c
-index 425f1d90..91fa65fb 100644
---- a/plugins/curl/curl.c
-+++ b/plugins/curl/curl.c
-@@ -68,6 +68,7 @@ struct curl_slist *headers = NULL;
- const char *header_script = NULL;
- unsigned header_script_renew = 0;
- long http_version = CURL_HTTP_VERSION_NONE;
-+long ipresolve = CURL_IPRESOLVE_WHATEVER;
- char *password = NULL;
- #ifndef HAVE_CURLOPT_PROTOCOLS_STR
- long protocols = CURLPROTO_ALL;
-@@ -314,6 +315,19 @@ curl_config (const char *key, const char *value)
-     }
-   }
- 
-+  else if (strcmp (key, "ipresolve") == 0) {
-+    if (strcmp (value, "any") == 0 || strcmp (value, "whatever") == 0)
-+      ipresolve = CURL_IPRESOLVE_WHATEVER;
-+    else if (strcmp (value, "v4") == 0 || strcmp (value, "4") == 0)
-+      ipresolve = CURL_IPRESOLVE_V4;
-+    else if (strcmp (value, "v6") == 0 || strcmp (value, "6") == 0)
-+      ipresolve = CURL_IPRESOLVE_V6;
-+    else {
-+      nbdkit_error ("unknown ipresolve: %s", value);
-+      return -1;
-+    }
-+  }
-+
-   else if (strcmp (key, "password") == 0) {
-     free (password);
-     if (nbdkit_read_password (value, &password) == -1)
-@@ -495,6 +509,7 @@ curl_config_complete (void)
-   "header-script=<SCRIPT>     Script to set HTTP/HTTPS headers.\n" \
-   "header-script-renew=<SECS> Time to renew HTTP/HTTPS headers.\n" \
-   "http-version=none|...      Force a particular HTTP protocol.\n" \
-+  "ipresolve=any|v4|v6        Force IPv4 or IPv6.\n" \
-   "password=<PASSWORD>        The password for the user account.\n" \
-   "protocols=PROTO,PROTO,..   Limit protocols allowed.\n" \
-   "proxy=<PROXY>              Set proxy URL.\n" \
-diff --git a/plugins/curl/curldefs.h b/plugins/curl/curldefs.h
-index 2a74a369..815be2e1 100644
---- a/plugins/curl/curldefs.h
-+++ b/plugins/curl/curldefs.h
-@@ -61,6 +61,7 @@ extern struct curl_slist *headers;
- extern const char *header_script;
- extern unsigned header_script_renew;
- extern long http_version;
-+extern long ipresolve;
- extern char *password;
- #ifndef HAVE_CURLOPT_PROTOCOLS_STR
- extern long protocols;
-diff --git a/plugins/curl/nbdkit-curl-plugin.pod b/plugins/curl/nbdkit-curl-plugin.pod
-index 070f9a0f..e12ca197 100644
---- a/plugins/curl/nbdkit-curl-plugin.pod
-+++ b/plugins/curl/nbdkit-curl-plugin.pod
-@@ -208,6 +208,19 @@ meaning curl will negotiate the best protocol with the server.  The
- other settings are mainly for testing.  See L<CURLOPT_HTTP_VERSION(3)>
- for details.
- 
-+=item B<ipresolve=any>
-+
-+=item B<ipresolve=v4>
-+
-+=item B<ipresolve=v6>
-+
-+(nbdkit E<ge> 1.36)
-+
-+Force curl to use only IPv4 (C<ipresolve=v4>), only IPv6
-+(C<ipresolve=v6>) or any IP version supported by your system
-+(C<ipresolve=any>).  The default is C<any>.  See
-+L<CURLOPT_IPRESOLVE(3)>.
-+
- =item B<password=>PASSWORD
- 
- Set the password to use when connecting to the remote server.
-@@ -559,6 +572,7 @@ L<CURLOPT_COOKIEFILE(3)>,
- L<CURLOPT_COOKIEJAR(3)>,
- L<CURLOPT_FOLLOWLOCATION(3)>,
- L<CURLOPT_HTTPHEADER(3)>,
-+L<CURLOPT_IPRESOLVE(3)>,
- L<CURLOPT_PROXY(3)>,
- L<CURLOPT_SSL_CIPHER_LIST(3)>,
- L<CURLOPT_SSLVERSION(3)>,
-diff --git a/plugins/curl/pool.c b/plugins/curl/pool.c
-index 731dd367..f0c3cb4f 100644
---- a/plugins/curl/pool.c
-+++ b/plugins/curl/pool.c
-@@ -257,6 +257,8 @@ allocate_handle (void)
-     curl_easy_setopt (ch->c, CURLOPT_HTTPHEADER, headers);
-   if (http_version != CURL_HTTP_VERSION_NONE)
-     curl_easy_setopt (ch->c, CURLOPT_HTTP_VERSION, (long) http_version);
-+  if (ipresolve != CURL_IPRESOLVE_WHATEVER)
-+    curl_easy_setopt (ch->c, CURLOPT_IPRESOLVE, (long) ipresolve);
- 
-   if (password)
-     curl_easy_setopt (ch->c, CURLOPT_PASSWORD, password);
--- 
-2.39.3
-
diff --git a/0010-curl-Add-resolve-option.patch b/0010-curl-Add-resolve-option.patch
deleted file mode 100644
index ff4f0d5..0000000
--- a/0010-curl-Add-resolve-option.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 55e55ea986ef5fed595bb5a4203e8734d79f1474 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 25 Jul 2023 17:36:31 +0100
-Subject: [PATCH] curl: Add resolve option
-
-This allows you to force a particular IP address for the URL host
-name.
-
-(cherry picked from commit 4f0989cbf0e9eeb959879b1c82b52940f6c5c3cc)
----
- plugins/curl/curl.c                 | 12 ++++++++++++
- plugins/curl/curldefs.h             |  1 +
- plugins/curl/nbdkit-curl-plugin.pod |  7 +++++++
- plugins/curl/pool.c                 |  2 ++
- 4 files changed, 22 insertions(+)
-
-diff --git a/plugins/curl/curl.c b/plugins/curl/curl.c
-index 91fa65fb..381433fd 100644
---- a/plugins/curl/curl.c
-+++ b/plugins/curl/curl.c
-@@ -78,6 +78,7 @@ const char *protocols = NULL;
- const char *proxy = NULL;
- char *proxy_password = NULL;
- const char *proxy_user = NULL;
-+struct curl_slist *resolves = NULL;
- bool sslverify = true;
- const char *ssl_cipher_list = NULL;
- long ssl_version = CURL_SSLVERSION_DEFAULT;
-@@ -112,6 +113,8 @@ curl_unload (void)
-     curl_slist_free_all (headers);
-   free (password);
-   free (proxy_password);
-+  if (resolves)
-+    curl_slist_free_all (resolves);
-   scripts_unload ();
-   free_all_handles ();
-   curl_global_cleanup ();
-@@ -356,6 +359,14 @@ curl_config (const char *key, const char *value)
-   else if (strcmp (key, "proxy-user") == 0)
-     proxy_user = value;
- 
-+  else if (strcmp (key, "resolve") == 0) {
-+    resolves = curl_slist_append (headers, value);
-+    if (resolves == NULL) {
-+      nbdkit_error ("curl_slist_append: %m");
-+      return -1;
-+    }
-+  }
-+
-   else if (strcmp (key, "sslverify") == 0) {
-     r = nbdkit_parse_bool (value);
-     if (r == -1)
-@@ -515,6 +526,7 @@ curl_config_complete (void)
-   "proxy=<PROXY>              Set proxy URL.\n" \
-   "proxy-password=<PASSWORD>  The proxy password.\n" \
-   "proxy-user=<USER>          The proxy user.\n" \
-+  "resolve=<HOST>:<PORT>:<ADDR> Custom host to IP address resolution.\n" \
-   "sslverify=false            Do not verify SSL certificate of remote host.\n" \
-   "ssl-cipher-list=C1:C2:..   Specify TLS/SSL cipher suites to be used.\n" \
-   "ssl-version=<VERSION>      Specify preferred TLS/SSL version.\n" \
-diff --git a/plugins/curl/curldefs.h b/plugins/curl/curldefs.h
-index 815be2e1..613cfed7 100644
---- a/plugins/curl/curldefs.h
-+++ b/plugins/curl/curldefs.h
-@@ -74,6 +74,7 @@ extern const char *proxy_user;
- extern bool sslverify;
- extern const char *ssl_cipher_list;
- extern long ssl_version;
-+extern struct curl_slist *resolves;
- extern const char *tls13_ciphers;
- extern bool tcp_keepalive;
- extern bool tcp_nodelay;
-diff --git a/plugins/curl/nbdkit-curl-plugin.pod b/plugins/curl/nbdkit-curl-plugin.pod
-index e12ca197..a7315047 100644
---- a/plugins/curl/nbdkit-curl-plugin.pod
-+++ b/plugins/curl/nbdkit-curl-plugin.pod
-@@ -289,6 +289,12 @@ Set the proxy.  See L<CURLOPT_PROXY(3)>.
- 
- Set the proxy username and password.
- 
-+=item B<resolve=>HOSTB<:>PORTB<:>ADDRESS
-+
-+Provide custom host name to IP address resolution.  You can supply
-+this option as many times as needed.  See L<CURLOPT_RESOLVE(3)> for
-+the full details of this option.
-+
- =item B<sslverify=false>
- 
- Don't verify the SSL certificate of the remote host.
-@@ -574,6 +580,7 @@ L<CURLOPT_FOLLOWLOCATION(3)>,
- L<CURLOPT_HTTPHEADER(3)>,
- L<CURLOPT_IPRESOLVE(3)>,
- L<CURLOPT_PROXY(3)>,
-+L<CURLOPT_RESOLVE(3)>,
- L<CURLOPT_SSL_CIPHER_LIST(3)>,
- L<CURLOPT_SSLVERSION(3)>,
- L<CURLOPT_TCP_KEEPALIVE(3)>,
-diff --git a/plugins/curl/pool.c b/plugins/curl/pool.c
-index f0c3cb4f..a6e2f9f5 100644
---- a/plugins/curl/pool.c
-+++ b/plugins/curl/pool.c
-@@ -283,6 +283,8 @@ allocate_handle (void)
-     curl_easy_setopt (ch->c, CURLOPT_SSL_VERIFYPEER, 0L);
-     curl_easy_setopt (ch->c, CURLOPT_SSL_VERIFYHOST, 0L);
-   }
-+  if (resolves)
-+    curl_easy_setopt (ch->c, CURLOPT_RESOLVE, resolves);
-   if (ssl_version != CURL_SSLVERSION_DEFAULT)
-     curl_easy_setopt (ch->c, CURLOPT_SSLVERSION, (long) ssl_version);
-   if (ssl_cipher_list)
--- 
-2.39.3
-
diff --git a/0011-curl-pool-Add-abstract-load_pool-and-unload_pool-fun.patch b/0011-curl-pool-Add-abstract-load_pool-and-unload_pool-fun.patch
deleted file mode 100644
index f5cfa69..0000000
--- a/0011-curl-pool-Add-abstract-load_pool-and-unload_pool-fun.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From f14fbc9498f52661fd8b9c895144eb40bf8bcd64 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 25 Jul 2023 18:57:00 +0100
-Subject: [PATCH] curl: pool: Add abstract load_pool and unload_pool functions
-
-Simple code refactoring.
-
-(cherry picked from commit 93761b2abf4c5923a410a4f176ee66c690520a2c)
----
- plugins/curl/curl.c     |  4 +++-
- plugins/curl/curldefs.h |  3 ++-
- plugins/curl/pool.c     | 10 ++++++++--
- 3 files changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/plugins/curl/curl.c b/plugins/curl/curl.c
-index 381433fd..3557fd53 100644
---- a/plugins/curl/curl.c
-+++ b/plugins/curl/curl.c
-@@ -103,6 +103,8 @@ curl_load (void)
-     nbdkit_error ("libcurl initialization failed: %d", (int) r);
-     exit (EXIT_FAILURE);
-   }
-+
-+  load_pool ();
- }
- 
- static void
-@@ -116,7 +118,7 @@ curl_unload (void)
-   if (resolves)
-     curl_slist_free_all (resolves);
-   scripts_unload ();
--  free_all_handles ();
-+  unload_pool ();
-   curl_global_cleanup ();
- }
- 
-diff --git a/plugins/curl/curldefs.h b/plugins/curl/curldefs.h
-index 613cfed7..4506f3e1 100644
---- a/plugins/curl/curldefs.h
-+++ b/plugins/curl/curldefs.h
-@@ -122,9 +122,10 @@ struct curl_handle {
- };
- 
- /* pool.c */
-+extern void load_pool (void);
-+extern void unload_pool (void);
- extern struct curl_handle *get_handle (void);
- extern void put_handle (struct curl_handle *ch);
--extern void free_all_handles (void);
- 
- /* scripts.c */
- extern int do_scripts (struct curl_handle *ch);
-diff --git a/plugins/curl/pool.c b/plugins/curl/pool.c
-index a6e2f9f5..f91cdf57 100644
---- a/plugins/curl/pool.c
-+++ b/plugins/curl/pool.c
-@@ -89,14 +89,20 @@ static curl_handle_list curl_handles = empty_vector;
- static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
- static size_t in_use = 0, waiting = 0;
- 
-+/* Initialize pool structures. */
-+void
-+load_pool (void)
-+{
-+}
-+
- /* Close and free all handles in the pool. */
- void
--free_all_handles (void)
-+unload_pool (void)
- {
-   size_t i;
- 
-   if (curl_debug_pool)
--    nbdkit_debug ("free_all_handles: number of curl handles allocated: %zu",
-+    nbdkit_debug ("unload_pool: number of curl handles allocated: %zu",
-                   curl_handles.len);
- 
-   for (i = 0; i < curl_handles.len; ++i)
--- 
-2.39.3
-
diff --git a/0012-curl-Add-D-curl.times-1-to-collect-time-statistics.patch b/0012-curl-Add-D-curl.times-1-to-collect-time-statistics.patch
deleted file mode 100644
index f54fab7..0000000
--- a/0012-curl-Add-D-curl.times-1-to-collect-time-statistics.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-From d8bbc2dd00eddd2c36a6a718f7e21e6e7d4f26e5 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 25 Jul 2023 21:45:31 +0100
-Subject: [PATCH] curl: Add -D curl.times=1 to collect time statistics
-
-(cherry picked from commit 68dddbeb584fb9385915846d259563f74338ffe8)
----
- plugins/curl/Makefile.am            |   1 +
- plugins/curl/curl.c                 |   3 +
- plugins/curl/curldefs.h             |  13 +++
- plugins/curl/nbdkit-curl-plugin.pod |  21 +++++
- plugins/curl/pool.c                 |   2 +
- plugins/curl/times.c                | 130 ++++++++++++++++++++++++++++
- 6 files changed, 170 insertions(+)
- create mode 100644 plugins/curl/times.c
-
-diff --git a/plugins/curl/Makefile.am b/plugins/curl/Makefile.am
-index 82c09582..f5f1cc1a 100644
---- a/plugins/curl/Makefile.am
-+++ b/plugins/curl/Makefile.am
-@@ -42,6 +42,7 @@ nbdkit_curl_plugin_la_SOURCES = \
- 	curl.c \
- 	pool.c \
- 	scripts.c \
-+	times.c \
- 	$(top_srcdir)/include/nbdkit-plugin.h \
- 	$(NULL)
- 
-diff --git a/plugins/curl/curl.c b/plugins/curl/curl.c
-index 3557fd53..0d1fcfee 100644
---- a/plugins/curl/curl.c
-+++ b/plugins/curl/curl.c
-@@ -119,6 +119,7 @@ curl_unload (void)
-     curl_slist_free_all (resolves);
-   scripts_unload ();
-   unload_pool ();
-+  display_times ();
-   curl_global_cleanup ();
- }
- 
-@@ -639,6 +640,7 @@ curl_pread (void *handle, void *buf, uint32_t count, uint64_t offset)
-     display_curl_error (ch, r, "pread: curl_easy_perform");
-     return -1;
-   }
-+  update_times (ch->c);
- 
-   /* Could use curl_easy_getinfo here to obtain further information
-    * about the connection.
-@@ -683,6 +685,7 @@ curl_pwrite (void *handle, const void *buf, uint32_t count, uint64_t offset)
-     display_curl_error (ch, r, "pwrite: curl_easy_perform");
-     return -1;
-   }
-+  update_times (ch->c);
- 
-   /* Could use curl_easy_getinfo here to obtain further information
-    * about the connection.
-diff --git a/plugins/curl/curldefs.h b/plugins/curl/curldefs.h
-index 4506f3e1..dd9791aa 100644
---- a/plugins/curl/curldefs.h
-+++ b/plugins/curl/curldefs.h
-@@ -44,6 +44,15 @@
- #if CURL_AT_LEAST_VERSION (7, 55, 0)
- #define HAVE_CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
- #endif
-+#if CURL_AT_LEAST_VERSION (7, 61, 0)
-+#define HAVE_CURLINFO_NAMELOOKUP_TIME_T
-+#define HAVE_CURLINFO_CONNECT_TIME_T
-+#define HAVE_CURLINFO_APPCONNECT_TIME_T
-+#define HAVE_CURLINFO_PRETRANSFER_TIME_T
-+#define HAVE_CURLINFO_STARTTRANSFER_TIME_T
-+#define HAVE_CURLINFO_TOTAL_TIME_T
-+#define HAVE_CURLINFO_REDIRECT_TIME_T
-+#endif
- #endif
- 
- extern const char *url;
-@@ -131,6 +140,10 @@ extern void put_handle (struct curl_handle *ch);
- extern int do_scripts (struct curl_handle *ch);
- extern void scripts_unload (void);
- 
-+/* times.c */
-+extern void update_times (CURL *c); /* called after every curl_easy_perform */
-+extern void display_times (void);
-+
- /* Translate CURLcode to nbdkit_error. */
- #define display_curl_error(ch, r, fs, ...)                      \
-   do {                                                          \
-diff --git a/plugins/curl/nbdkit-curl-plugin.pod b/plugins/curl/nbdkit-curl-plugin.pod
-index a7315047..0fd688ed 100644
---- a/plugins/curl/nbdkit-curl-plugin.pod
-+++ b/plugins/curl/nbdkit-curl-plugin.pod
-@@ -543,6 +543,27 @@ This prints out the headers and cookies generated by the
- C<header-script> and C<cookie-script> options, which can be useful
- when debugging these scripts.
- 
-+=item B<-D curl.times=1>
-+
-+This prints out additional information about the total time taken to
-+do name resolution, connect to the remote server, etc.  The
-+information is printed in the debug output before nbdkit exits.  The
-+output will look like:
-+
-+ nbdkit: debug: times (-D curl.times=1):
-+ nbdkit: debug: name resolution               :   0.128442 s
-+ nbdkit: debug: connection                    :   4.945213 s
-+ nbdkit: debug: SSL negotiation               :   4.291362 s
-+ nbdkit: debug: pretransfer                   :   0.104137 s
-+ nbdkit: debug: first byte received           :  56.115269 s
-+ nbdkit: debug: data transfer                 : 222.633831 s
-+ nbdkit: debug: redirection time              :   0.000000 s
-+
-+The cumulative time taken to perform each step is shown (summed across
-+all HTTP connections).  The redirection time is the total time taken
-+doing HTTP redirections.  For further information see
-+L<curl_easy_getinfo(3)/TIMES>.
-+
- =item B<-D curl.verbose=1>
- 
- This enables very verbose curl debugging.  See L<CURLOPT_VERBOSE(3)>.
-diff --git a/plugins/curl/pool.c b/plugins/curl/pool.c
-index f91cdf57..10f9011d 100644
---- a/plugins/curl/pool.c
-+++ b/plugins/curl/pool.c
-@@ -475,6 +475,7 @@ get_content_length_accept_range (struct curl_handle *ch)
-     display_curl_error (ch, r,
-                         "problem doing HEAD request to fetch size of URL [%s]",
-                         url);
-+  update_times (ch->c);
- 
-     /* Get the HTTP status code, if available. */
-     r = curl_easy_getinfo (ch->c, CURLINFO_RESPONSE_CODE, &code);
-@@ -569,6 +570,7 @@ try_fallback_GET_method (struct curl_handle *ch)
-   curl_easy_setopt (ch->c, CURLOPT_WRITEFUNCTION, error_cb);
-   curl_easy_setopt (ch->c, CURLOPT_WRITEDATA, ch);
-   r = curl_easy_perform (ch->c);
-+  update_times (ch->c);
- 
-   /* We expect CURLE_WRITE_ERROR here, but CURLE_OK is possible too
-    * (eg if the remote has zero length).  Other errors might happen
-diff --git a/plugins/curl/times.c b/plugins/curl/times.c
-new file mode 100644
-index 00000000..8cc4cf27
---- /dev/null
-+++ b/plugins/curl/times.c
-@@ -0,0 +1,130 @@
-+/* nbdkit
-+ * Copyright Red Hat
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are
-+ * met:
-+ *
-+ * * Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ *
-+ * * Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ *
-+ * * Neither the name of Red Hat nor the names of its contributors may be
-+ * used to endorse or promote products derived from this software without
-+ * specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY RED HAT AND CONTRIBUTORS ''AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL RED HAT OR
-+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#include <config.h>
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <stdbool.h>
-+#include <stdint.h>
-+#include <inttypes.h>
-+
-+#include <curl/curl.h>
-+
-+#include <nbdkit-plugin.h>
-+
-+#include "array-size.h"
-+
-+#include "curldefs.h"
-+
-+/* Use '-D curl.times=1' to set. */
-+NBDKIT_DLL_PUBLIC int curl_debug_times = 0;
-+
-+/* The cumulative times. */
-+static struct {
-+  bool cumulative;
-+  const char *name;
-+  CURLINFO info;
-+  curl_off_t t;
-+} times[] = {
-+#ifdef HAVE_CURLINFO_NAMELOOKUP_TIME_T
-+  { true, "name resolution", CURLINFO_NAMELOOKUP_TIME_T },
-+#endif
-+#ifdef HAVE_CURLINFO_CONNECT_TIME_T
-+  { true, "connection", CURLINFO_CONNECT_TIME_T },
-+#endif
-+#ifdef HAVE_CURLINFO_APPCONNECT_TIME_T
-+  { true, "SSL negotiation", CURLINFO_APPCONNECT_TIME_T },
-+#endif
-+#ifdef HAVE_CURLINFO_PRETRANSFER_TIME_T
-+  { true, "pretransfer", CURLINFO_PRETRANSFER_TIME_T },
-+#endif
-+#ifdef HAVE_CURLINFO_STARTTRANSFER_TIME_T
-+  { true, "first byte received", CURLINFO_STARTTRANSFER_TIME_T },
-+#endif
-+#ifdef HAVE_CURLINFO_TOTAL_TIME_T
-+  { true, "data transfer", CURLINFO_TOTAL_TIME_T },
-+#endif
-+#ifdef HAVE_CURLINFO_REDIRECT_TIME_T
-+  { false, "redirection time", CURLINFO_REDIRECT_TIME_T },
-+#endif
-+};
-+
-+/* This is called after every curl_easy_perform.  If -D curl.times=1
-+ * then we update the time counters.  Refer to curl_easy_getinfo(3)
-+ * section "TIMES".
-+ */
-+void
-+update_times (CURL *c)
-+{
-+  size_t i;
-+  CURLcode r;
-+  curl_off_t t;
-+
-+  if (!curl_debug_times) return;
-+
-+  for (i = 0; i < ARRAY_SIZE (times); ++i) {
-+    r = curl_easy_getinfo (c, times[i].info, &t);
-+    if (r != CURLE_OK) {
-+      nbdkit_debug ("curl_easy_getinfo: error getting time '%s': %s",
-+                    times[i].name, curl_easy_strerror (r));
-+      continue;
-+    }
-+    if (curl_debug_verbose)
-+      nbdkit_debug ("time '%s': %" PRIi64, times[i].name, (int64_t) t);
-+    times[i].t += t;
-+  }
-+}
-+
-+/* Called when the plugin is unloaded. */
-+void
-+display_times (void)
-+{
-+  size_t i;
-+  int64_t prev_t = 0, t, v;
-+
-+  if (!curl_debug_times) return;
-+
-+  nbdkit_debug ("times (-D curl.times=1):");
-+  for (i = 0; i < ARRAY_SIZE (times); ++i) {
-+    t = times[i].t;             /* in microseconds */
-+    if (times[i].cumulative)
-+      v = t - prev_t;
-+    else
-+      v = t;
-+    prev_t = t;
-+
-+    nbdkit_debug ("%-30s: %3" PRIi64 ".%06" PRIi64 " s",
-+                  times[i].name,
-+                  v / 1000000, v % 1000000);
-+  }
-+}
--- 
-2.39.3
-
diff --git a/0013-curl-Fix-call-to-update_times.patch b/0013-curl-Fix-call-to-update_times.patch
deleted file mode 100644
index ff8e8ab..0000000
--- a/0013-curl-Fix-call-to-update_times.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 320af6bbc9d71e3e67cf1d6e59d4a5094324d41c Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 27 Jul 2023 17:08:50 +0100
-Subject: [PATCH] curl: Fix call to update_times
-
-This was called in the wrong place so we didn't count the cost of
-making the initial HEAD call on each handle.
-
-Fixes: commit 68dddbeb584fb9385915846d259563f74338ffe8
-(cherry picked from commit f2d7041f94af15b158c92a96b9d9fdf4d3b7cdef)
----
- plugins/curl/pool.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/curl/pool.c b/plugins/curl/pool.c
-index 10f9011d..8db69a71 100644
---- a/plugins/curl/pool.c
-+++ b/plugins/curl/pool.c
-@@ -471,11 +471,11 @@ get_content_length_accept_range (struct curl_handle *ch)
-   curl_easy_setopt (ch->c, CURLOPT_HEADERFUNCTION, header_cb);
-   curl_easy_setopt (ch->c, CURLOPT_HEADERDATA, ch);
-   r = curl_easy_perform (ch->c);
-+  update_times (ch->c);
-   if (r != CURLE_OK) {
-     display_curl_error (ch, r,
-                         "problem doing HEAD request to fetch size of URL [%s]",
-                         url);
--  update_times (ch->c);
- 
-     /* Get the HTTP status code, if available. */
-     r = curl_easy_getinfo (ch->c, CURLINFO_RESPONSE_CODE, &code);
--- 
-2.39.3
-
diff --git a/0014-curl-Move-configuration-code-to-a-separate-file.patch b/0014-curl-Move-configuration-code-to-a-separate-file.patch
deleted file mode 100644
index ee1c77e..0000000
--- a/0014-curl-Move-configuration-code-to-a-separate-file.patch
+++ /dev/null
@@ -1,2075 +0,0 @@
-From 06d446098c2fbc23bb7dc2159568c39db1623c8b Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 27 Jul 2023 14:27:36 +0100
-Subject: [PATCH] curl: Move configuration code to a separate file
-
-Previously making a change to the curl handle configuration involved
-updating code across several files.  Centralise this code in one
-place.
-
-After this commit, configuration changes only affect
-plugins/curl/config.c, although you will still need to change the
-documentation in nbdkit-curl-plugin.pod.
-
-This change is just refactoring.  No change in functionality is
-intended.
-
-(cherry picked from commit ef762737bcad713f6a55092d88285bdf466a781c)
----
- plugins/curl/Makefile.am |   1 +
- plugins/curl/config.c    | 974 +++++++++++++++++++++++++++++++++++++++
- plugins/curl/curl.c      | 476 +------------------
- plugins/curl/curldefs.h  |  38 +-
- plugins/curl/pool.c      | 455 +-----------------
- 5 files changed, 998 insertions(+), 946 deletions(-)
- create mode 100644 plugins/curl/config.c
-
-diff --git a/plugins/curl/Makefile.am b/plugins/curl/Makefile.am
-index f5f1cc1a..7529fb2f 100644
---- a/plugins/curl/Makefile.am
-+++ b/plugins/curl/Makefile.am
-@@ -38,6 +38,7 @@ if HAVE_CURL
- plugin_LTLIBRARIES = nbdkit-curl-plugin.la
- 
- nbdkit_curl_plugin_la_SOURCES = \
-+	config.c \
- 	curldefs.h \
- 	curl.c \
- 	pool.c \
-diff --git a/plugins/curl/config.c b/plugins/curl/config.c
-new file mode 100644
-index 00000000..742d6080
---- /dev/null
-+++ b/plugins/curl/config.c
-@@ -0,0 +1,974 @@
-+/* nbdkit
-+ * Copyright Red Hat
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are
-+ * met:
-+ *
-+ * * Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ *
-+ * * Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ *
-+ * * Neither the name of Red Hat nor the names of its contributors may be
-+ * used to endorse or promote products derived from this software without
-+ * specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY RED HAT AND CONTRIBUTORS ''AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL RED HAT OR
-+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#include <config.h>
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <stdbool.h>
-+#include <stdint.h>
-+#include <inttypes.h>
-+#include <limits.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#include <assert.h>
-+
-+#include <curl/curl.h>
-+
-+#include <nbdkit-plugin.h>
-+
-+#include "ascii-ctype.h"
-+#include "ascii-string.h"
-+#include "cleanup.h"
-+
-+#include "curldefs.h"
-+
-+/* Plugin configuration. */
-+const char *url = NULL;         /* required */
-+
-+static const char *cainfo = NULL;
-+static const char *capath = NULL;
-+static char *cookie = NULL;
-+static const char *cookiefile = NULL;
-+static const char *cookiejar = NULL;
-+static bool followlocation = true;
-+static struct curl_slist *headers = NULL;
-+static long http_version = CURL_HTTP_VERSION_NONE;
-+static long ipresolve = CURL_IPRESOLVE_WHATEVER;
-+static char *password = NULL;
-+#ifndef HAVE_CURLOPT_PROTOCOLS_STR
-+static long protocols = CURLPROTO_ALL;
-+#else
-+static const char *protocols = NULL;
-+#endif
-+static const char *proxy = NULL;
-+static char *proxy_password = NULL;
-+static const char *proxy_user = NULL;
-+static struct curl_slist *resolves = NULL;
-+static bool sslverify = true;
-+static const char *ssl_cipher_list = NULL;
-+static long ssl_version = CURL_SSLVERSION_DEFAULT;
-+static const char *tls13_ciphers = NULL;
-+static bool tcp_keepalive = false;
-+static bool tcp_nodelay = true;
-+static uint32_t timeout = 0;
-+static const char *unix_socket_path = NULL;
-+static const char *user = NULL;
-+static const char *user_agent = NULL;
-+
-+static int debug_cb (CURL *handle, curl_infotype type,
-+                     const char *data, size_t size, void *);
-+static size_t write_cb (char *ptr, size_t size, size_t nmemb, void *opaque);
-+static size_t read_cb (void *ptr, size_t size, size_t nmemb, void *opaque);
-+static int get_content_length_accept_range (struct curl_handle *ch);
-+static bool try_fallback_GET_method (struct curl_handle *ch);
-+static size_t header_cb (void *ptr, size_t size, size_t nmemb, void *opaque);
-+static size_t error_cb (char *ptr, size_t size, size_t nmemb, void *opaque);
-+
-+/* Use '-D curl.verbose=1' to set. */
-+NBDKIT_DLL_PUBLIC int curl_debug_verbose = 0;
-+
-+void
-+unload_config (void)
-+{
-+  free (cookie);
-+  if (headers)
-+    curl_slist_free_all (headers);
-+  free (password);
-+  free (proxy_password);
-+  if (resolves)
-+    curl_slist_free_all (resolves);
-+}
-+
-+#ifndef HAVE_CURLOPT_PROTOCOLS_STR
-+/* See <curl/curl.h> */
-+static struct { const char *name; long bitmask; } curl_protocols[] = {
-+  { "http", CURLPROTO_HTTP },
-+  { "https", CURLPROTO_HTTPS },
-+  { "ftp", CURLPROTO_FTP },
-+  { "ftps", CURLPROTO_FTPS },
-+  { "scp", CURLPROTO_SCP },
-+  { "sftp", CURLPROTO_SFTP },
-+  { "telnet", CURLPROTO_TELNET },
-+  { "ldap", CURLPROTO_LDAP },
-+  { "ldaps", CURLPROTO_LDAPS },
-+  { "dict", CURLPROTO_DICT },
-+  { "file", CURLPROTO_FILE },
-+  { "tftp", CURLPROTO_TFTP },
-+  { "imap", CURLPROTO_IMAP },
-+  { "imaps", CURLPROTO_IMAPS },
-+  { "pop3", CURLPROTO_POP3 },
-+  { "pop3s", CURLPROTO_POP3S },
-+  { "smtp", CURLPROTO_SMTP },
-+  { "smtps", CURLPROTO_SMTPS },
-+  { "rtsp", CURLPROTO_RTSP },
-+  { "rtmp", CURLPROTO_RTMP },
-+  { "rtmpt", CURLPROTO_RTMPT },
-+  { "rtmpe", CURLPROTO_RTMPE },
-+  { "rtmpte", CURLPROTO_RTMPTE },
-+  { "rtmps", CURLPROTO_RTMPS },
-+  { "rtmpts", CURLPROTO_RTMPTS },
-+  { "gopher", CURLPROTO_GOPHER },
-+#ifdef CURLPROTO_SMB
-+  { "smb", CURLPROTO_SMB },
-+#endif
-+#ifdef CURLPROTO_SMBS
-+  { "smbs", CURLPROTO_SMBS },
-+#endif
-+#ifdef CURLPROTO_MQTT
-+  { "mqtt", CURLPROTO_MQTT },
-+#endif
-+  { NULL }
-+};
-+
-+/* Parse the protocols parameter. */
-+static int
-+parse_protocols (const char *value)
-+{
-+  size_t n, i;
-+
-+  protocols = 0;
-+
-+  while (*value) {
-+    n = strcspn (value, ",");
-+    for (i = 0; curl_protocols[i].name != NULL; ++i) {
-+      if (strlen (curl_protocols[i].name) == n &&
-+          strncmp (value, curl_protocols[i].name, n) == 0) {
-+        protocols |= curl_protocols[i].bitmask;
-+        goto found;
-+      }
-+    }
-+    nbdkit_error ("protocols: protocol name not found: %.*s", (int) n, value);
-+    return -1;
-+
-+  found:
-+    value += n;
-+    if (*value == ',')
-+      value++;
-+  }
-+
-+  if (protocols == 0) {
-+    nbdkit_error ("protocols: empty list of protocols is not allowed");
-+    return -1;
-+  }
-+
-+  nbdkit_debug ("curl: protocols: %ld", protocols);
-+
-+  return 0;
-+}
-+#endif /* !HAVE_CURLOPT_PROTOCOLS_STR */
-+
-+/* Called for each key=value passed on the command line. */
-+int
-+curl_config (const char *key, const char *value)
-+{
-+  int r;
-+
-+  if (strcmp (key, "cainfo") == 0) {
-+    cainfo = value;
-+  }
-+
-+  else if (strcmp (key, "capath") == 0) {
-+    capath =  value;
-+  }
-+
-+  else if (strcmp (key, "connections") == 0) {
-+    if (nbdkit_parse_unsigned ("connections", value,
-+                               &connections) == -1)
-+      return -1;
-+    if (connections == 0) {
-+      nbdkit_error ("connections parameter must not be 0");
-+      return -1;
-+    }
-+  }
-+
-+  else if (strcmp (key, "cookie") == 0) {
-+    free (cookie);
-+    if (nbdkit_read_password (value, &cookie) == -1)
-+      return -1;
-+  }
-+
-+  else if (strcmp (key, "cookiefile") == 0) {
-+    /* Reject cookiefile=- because it will cause libcurl to try to
-+     * read from stdin when we connect.
-+     */
-+    if (strcmp (value, "-") == 0) {
-+      nbdkit_error ("cookiefile parameter cannot be \"-\"");
-+      return -1;
-+    }
-+    cookiefile = value;
-+  }
-+
-+  else if (strcmp (key, "cookiejar") == 0) {
-+    /* Reject cookiejar=- because it will cause libcurl to try to
-+     * write to stdout.
-+     */
-+    if (strcmp (value, "-") == 0) {
-+      nbdkit_error ("cookiejar parameter cannot be \"-\"");
-+      return -1;
-+    }
-+    cookiejar = value;
-+  }
-+
-+  else if (strcmp (key, "cookie-script") == 0) {
-+    cookie_script = value;
-+  }
-+
-+  else if (strcmp (key, "cookie-script-renew") == 0) {
-+    if (nbdkit_parse_unsigned ("cookie-script-renew", value,
-+                               &cookie_script_renew) == -1)
-+      return -1;
-+  }
-+
-+  else if (strcmp (key, "followlocation") == 0) {
-+    r = nbdkit_parse_bool (value);
-+    if (r == -1)
-+      return -1;
-+    followlocation = r;
-+  }
-+
-+  else if (strcmp (key, "header") == 0) {
-+    headers = curl_slist_append (headers, value);
-+    if (headers == NULL) {
-+      nbdkit_error ("curl_slist_append: %m");
-+      return -1;
-+    }
-+  }
-+
-+  else if (strcmp (key, "header-script") == 0) {
-+    header_script = value;
-+  }
-+
-+  else if (strcmp (key, "header-script-renew") == 0) {
-+    if (nbdkit_parse_unsigned ("header-script-renew", value,
-+                               &header_script_renew) == -1)
-+      return -1;
-+  }
-+
-+  else if (strcmp (key, "http-version") == 0) {
-+    if (strcmp (value, "none") == 0)
-+      http_version = CURL_HTTP_VERSION_NONE;
-+    else if (strcmp (value, "1.0") == 0)
-+      http_version = CURL_HTTP_VERSION_1_0;
-+    else if (strcmp (value, "1.1") == 0)
-+      http_version = CURL_HTTP_VERSION_1_1;
-+#ifdef HAVE_CURL_HTTP_VERSION_2_0
-+    else if (strcmp (value, "2.0") == 0)
-+      http_version = CURL_HTTP_VERSION_2_0;
-+#endif
-+#ifdef HAVE_CURL_HTTP_VERSION_2TLS
-+    else if (strcmp (value, "2TLS") == 0)
-+      http_version = CURL_HTTP_VERSION_2TLS;
-+#endif
-+#ifdef HAVE_CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE
-+    else if (strcmp (value, "2-prior-knowledge") == 0)
-+      http_version = CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE;
-+#endif
-+#ifdef HAVE_CURL_HTTP_VERSION_3
-+    else if (strcmp (value, "3") == 0)
-+      http_version = CURL_HTTP_VERSION_3;
-+#endif
-+#ifdef HAVE_CURL_HTTP_VERSION_3ONLY
-+    else if (strcmp (value, "3only") == 0)
-+      http_version = CURL_HTTP_VERSION_3ONLY;
-+#endif
-+    else {
-+      nbdkit_error ("unknown http-version: %s", value);
-+      return -1;
-+    }
-+  }
-+
-+  else if (strcmp (key, "ipresolve") == 0) {
-+    if (strcmp (value, "any") == 0 || strcmp (value, "whatever") == 0)
-+      ipresolve = CURL_IPRESOLVE_WHATEVER;
-+    else if (strcmp (value, "v4") == 0 || strcmp (value, "4") == 0)
-+      ipresolve = CURL_IPRESOLVE_V4;
-+    else if (strcmp (value, "v6") == 0 || strcmp (value, "6") == 0)
-+      ipresolve = CURL_IPRESOLVE_V6;
-+    else {
-+      nbdkit_error ("unknown ipresolve: %s", value);
-+      return -1;
-+    }
-+  }
-+
-+  else if (strcmp (key, "password") == 0) {
-+    free (password);
-+    if (nbdkit_read_password (value, &password) == -1)
-+      return -1;
-+  }
-+
-+  else if (strcmp (key, "protocols") == 0) {
-+#ifndef HAVE_CURLOPT_PROTOCOLS_STR
-+    if (parse_protocols (value) == -1)
-+      return -1;
-+#else
-+    protocols = value;
-+#endif
-+  }
-+
-+  else if (strcmp (key, "proxy") == 0) {
-+    proxy = value;
-+  }
-+
-+  else if (strcmp (key, "proxy-password") == 0) {
-+    free (proxy_password);
-+    if (nbdkit_read_password (value, &proxy_password) == -1)
-+      return -1;
-+  }
-+
-+  else if (strcmp (key, "proxy-user") == 0)
-+    proxy_user = value;
-+
-+  else if (strcmp (key, "resolve") == 0) {
-+    resolves = curl_slist_append (headers, value);
-+    if (resolves == NULL) {
-+      nbdkit_error ("curl_slist_append: %m");
-+      return -1;
-+    }
-+  }
-+
-+  else if (strcmp (key, "sslverify") == 0) {
-+    r = nbdkit_parse_bool (value);
-+    if (r == -1)
-+      return -1;
-+    sslverify = r;
-+  }
-+
-+  else if (strcmp (key, "ssl-version") == 0) {
-+    if (strcmp (value, "default") == 0)
-+      ssl_version = CURL_SSLVERSION_DEFAULT;
-+    else if (strcmp (value, "tlsv1") == 0)
-+      ssl_version = CURL_SSLVERSION_TLSv1;
-+    else if (strcmp (value, "sslv2") == 0)
-+      ssl_version = CURL_SSLVERSION_SSLv2;
-+    else if (strcmp (value, "sslv3") == 0)
-+      ssl_version = CURL_SSLVERSION_SSLv3;
-+    else if (strcmp (value, "tlsv1.0") == 0)
-+      ssl_version = CURL_SSLVERSION_TLSv1_0;
-+    else if (strcmp (value, "tlsv1.1") == 0)
-+      ssl_version = CURL_SSLVERSION_TLSv1_1;
-+    else if (strcmp (value, "tlsv1.2") == 0)
-+      ssl_version = CURL_SSLVERSION_TLSv1_2;
-+    else if (strcmp (value, "tlsv1.3") == 0)
-+      ssl_version = CURL_SSLVERSION_TLSv1_3;
-+#ifdef HAVE_CURL_SSLVERSION_MAX_DEFAULT
-+    else if (strcmp (value, "max-default") == 0)
-+      ssl_version = CURL_SSLVERSION_MAX_DEFAULT;
-+#endif
-+#ifdef HAVE_CURL_SSLVERSION_MAX_TLSv1_0
-+    else if (strcmp (value, "max-tlsv1.0") == 0)
-+      ssl_version = CURL_SSLVERSION_MAX_TLSv1_0;
-+#endif
-+#ifdef HAVE_CURL_SSLVERSION_MAX_TLSv1_1
-+    else if (strcmp (value, "max-tlsv1.1") == 0)
-+      ssl_version = CURL_SSLVERSION_MAX_TLSv1_1;
-+#endif
-+#ifdef HAVE_CURL_SSLVERSION_MAX_TLSv1_2
-+    else if (strcmp (value, "max-tlsv1.2") == 0)
-+      ssl_version = CURL_SSLVERSION_MAX_TLSv1_2;
-+#endif
-+#ifdef HAVE_CURL_SSLVERSION_MAX_TLSv1_3
-+    else if (strcmp (value, "max-tlsv1.3") == 0)
-+      ssl_version = CURL_SSLVERSION_MAX_TLSv1_3;
-+#endif
-+    else {
-+      nbdkit_error ("unknown ssl-version: %s", value);
-+      return -1;
-+    }
-+  }
-+
-+  else if (strcmp (key, "ssl-cipher-list") == 0)
-+    ssl_cipher_list = value;
-+
-+  else if (strcmp (key, "tls13-ciphers") == 0)
-+    tls13_ciphers = value;
-+
-+  else if (strcmp (key, "tcp-keepalive") == 0) {
-+    r = nbdkit_parse_bool (value);
-+    if (r == -1)
-+      return -1;
-+    tcp_keepalive = r;
-+  }
-+
-+  else if (strcmp (key, "tcp-nodelay") == 0) {
-+    r = nbdkit_parse_bool (value);
-+    if (r == -1)
-+      return -1;
-+    tcp_nodelay = r;
-+  }
-+
-+  else if (strcmp (key, "timeout") == 0) {
-+    if (nbdkit_parse_uint32_t ("timeout", value, &timeout) == -1)
-+      return -1;
-+#if LONG_MAX < UINT32_MAX
-+    /* C17 5.2.4.2.1 requires that LONG_MAX is at least 2^31 - 1.
-+     * However a large positive number might still exceed the limit.
-+     */
-+    if (timeout > LONG_MAX) {
-+      nbdkit_error ("timeout is too large");
-+      return -1;
-+    }
-+#endif
-+  }
-+
-+  else if (strcmp (key, "unix-socket-path") == 0 ||
-+           strcmp (key, "unix_socket_path") == 0)
-+    unix_socket_path = value;
-+
-+  else if (strcmp (key, "url") == 0)
-+    url = value;
-+
-+  else if (strcmp (key, "user") == 0)
-+    user = value;
-+
-+  else if (strcmp (key, "user-agent") == 0)
-+    user_agent = value;
-+
-+  else {
-+    nbdkit_error ("unknown parameter '%s'", key);
-+    return -1;
-+  }
-+
-+  return 0;
-+}
-+
-+/* Check the user did pass a url parameter. */
-+int
-+curl_config_complete (void)
-+{
-+  if (url == NULL) {
-+    nbdkit_error ("you must supply the url=<URL> parameter "
-+                  "after the plugin name on the command line");
-+    return -1;
-+  }
-+
-+  if (headers && header_script) {
-+    nbdkit_error ("header and header-script cannot be used at the same time");
-+    return -1;
-+  }
-+
-+  if (!header_script && header_script_renew) {
-+    nbdkit_error ("header-script-renew cannot be used without header-script");
-+    return -1;
-+  }
-+
-+  if (cookie && cookie_script) {
-+    nbdkit_error ("cookie and cookie-script cannot be used at the same time");
-+    return -1;
-+  }
-+
-+  if (!cookie_script && cookie_script_renew) {
-+    nbdkit_error ("cookie-script-renew cannot be used without cookie-script");
-+    return -1;
-+  }
-+
-+  return 0;
-+}
-+
-+const char *curl_config_help =
-+  "cainfo=<CAINFO>            Path to Certificate Authority file.\n"
-+  "capath=<CAPATH>            Path to directory with CA certificates.\n"
-+  "connections=<N>            Number of libcurl connections to use.\n"
-+  "cookie=<COOKIE>            Set HTTP/HTTPS cookies.\n"
-+  "cookiefile=                Enable cookie processing.\n"
-+  "cookiefile=<FILENAME>      Read cookies from file.\n"
-+  "cookiejar=<FILENAME>       Read and write cookies to jar.\n"
-+  "cookie-script=<SCRIPT>     Script to set HTTP/HTTPS cookies.\n"
-+  "cookie-script-renew=<SECS> Time to renew HTTP/HTTPS cookies.\n"
-+  "followlocation=false       Do not follow redirects.\n"
-+  "header=<HEADER>            Set HTTP/HTTPS header.\n"
-+  "header-script=<SCRIPT>     Script to set HTTP/HTTPS headers.\n"
-+  "header-script-renew=<SECS> Time to renew HTTP/HTTPS headers.\n"
-+  "http-version=none|...      Force a particular HTTP protocol.\n"
-+  "ipresolve=any|v4|v6        Force IPv4 or IPv6.\n"
-+  "password=<PASSWORD>        The password for the user account.\n"
-+  "protocols=PROTO,PROTO,..   Limit protocols allowed.\n"
-+  "proxy=<PROXY>              Set proxy URL.\n"
-+  "proxy-password=<PASSWORD>  The proxy password.\n"
-+  "proxy-user=<USER>          The proxy user.\n"
-+  "resolve=<HOST>:<PORT>:<ADDR> Custom host to IP address resolution.\n"
-+  "sslverify=false            Do not verify SSL certificate of remote host.\n"
-+  "ssl-cipher-list=C1:C2:..   Specify TLS/SSL cipher suites to be used.\n"
-+  "ssl-version=<VERSION>      Specify preferred TLS/SSL version.\n"
-+  "tcp-keepalive=true         Enable TCP keepalives.\n"
-+  "tcp-nodelay=false          Disable Nagle’s algorithm.\n"
-+  "timeout=<TIMEOUT>          Set the timeout for requests (seconds).\n"
-+  "tls13-ciphers=C1:C2:..     Specify TLS 1.3 cipher suites to be used.\n"
-+  "unix-socket-path=<PATH>    Open Unix domain socket instead of TCP/IP.\n"
-+  "url=<URL>       (required) The disk image URL to serve.\n"
-+  "user=<USER>                The user to log in as.\n"
-+  "user-agent=<USER-AGENT>    Send user-agent header for HTTP/HTTPS."
-+  ;
-+
-+/* Allocate and initialize a new libcurl handle. */
-+struct curl_handle *
-+allocate_handle (void)
-+{
-+  struct curl_handle *ch;
-+  CURLcode r;
-+
-+  ch = calloc (1, sizeof *ch);
-+  if (ch == NULL) {
-+    nbdkit_error ("calloc: %m");
-+    free (ch);
-+    return NULL;
-+  }
-+
-+  ch->c = curl_easy_init ();
-+  if (ch->c == NULL) {
-+    nbdkit_error ("curl_easy_init: failed: %m");
-+    goto err;
-+  }
-+
-+  if (curl_debug_verbose) {
-+    /* NB: Constants must be explicitly long because the parameter is
-+     * varargs.
-+     */
-+    curl_easy_setopt (ch->c, CURLOPT_VERBOSE, 1L);
-+    curl_easy_setopt (ch->c, CURLOPT_DEBUGFUNCTION, debug_cb);
-+  }
-+
-+  curl_easy_setopt (ch->c, CURLOPT_ERRORBUFFER, ch->errbuf);
-+
-+  r = CURLE_OK;
-+  if (unix_socket_path) {
-+#if HAVE_CURLOPT_UNIX_SOCKET_PATH
-+    r = curl_easy_setopt (ch->c, CURLOPT_UNIX_SOCKET_PATH, unix_socket_path);
-+#else
-+    r = CURLE_UNKNOWN_OPTION;
-+#endif
-+  }
-+  if (r != CURLE_OK) {
-+    display_curl_error (ch, r, "curl_easy_setopt: CURLOPT_UNIX_SOCKET_PATH");
-+    goto err;
-+  }
-+
-+  /* Set the URL. */
-+  r = curl_easy_setopt (ch->c, CURLOPT_URL, url);
-+  if (r != CURLE_OK) {
-+    display_curl_error (ch, r, "curl_easy_setopt: CURLOPT_URL [%s]", url);
-+    goto err;
-+  }
-+
-+  /* Various options we always set.
-+   *
-+   * NB: Both here and below constants must be explicitly long because
-+   * the parameter is varargs.
-+   *
-+   * For use of CURLOPT_NOSIGNAL see:
-+   * https://curl.se/libcurl/c/CURLOPT_NOSIGNAL.html
-+   */
-+  curl_easy_setopt (ch->c, CURLOPT_NOSIGNAL, 1L);
-+  curl_easy_setopt (ch->c, CURLOPT_AUTOREFERER, 1L);
-+  if (followlocation)
-+    curl_easy_setopt (ch->c, CURLOPT_FOLLOWLOCATION, 1L);
-+  curl_easy_setopt (ch->c, CURLOPT_FAILONERROR, 1L);
-+
-+  /* Options. */
-+  if (cainfo) {
-+    if (strlen (cainfo) == 0)
-+      curl_easy_setopt (ch->c, CURLOPT_CAINFO, NULL);
-+    else
-+      curl_easy_setopt (ch->c, CURLOPT_CAINFO, cainfo);
-+  }
-+  if (capath)
-+    curl_easy_setopt (ch->c, CURLOPT_CAPATH, capath);
-+  if (cookie)
-+    curl_easy_setopt (ch->c, CURLOPT_COOKIE, cookie);
-+  if (cookiefile)
-+    curl_easy_setopt (ch->c, CURLOPT_COOKIEFILE, cookiefile);
-+  if (cookiejar)
-+    curl_easy_setopt (ch->c, CURLOPT_COOKIEJAR, cookiejar);
-+  if (headers)
-+    curl_easy_setopt (ch->c, CURLOPT_HTTPHEADER, headers);
-+  if (http_version != CURL_HTTP_VERSION_NONE)
-+    curl_easy_setopt (ch->c, CURLOPT_HTTP_VERSION, (long) http_version);
-+  if (ipresolve != CURL_IPRESOLVE_WHATEVER)
-+    curl_easy_setopt (ch->c, CURLOPT_IPRESOLVE, (long) ipresolve);
-+
-+  if (password)
-+    curl_easy_setopt (ch->c, CURLOPT_PASSWORD, password);
-+#ifndef HAVE_CURLOPT_PROTOCOLS_STR
-+  if (protocols != CURLPROTO_ALL) {
-+    curl_easy_setopt (ch->c, CURLOPT_PROTOCOLS, protocols);
-+    curl_easy_setopt (ch->c, CURLOPT_REDIR_PROTOCOLS, protocols);
-+  }
-+#else /* HAVE_CURLOPT_PROTOCOLS_STR (new in 7.85.0) */
-+  if (protocols) {
-+    curl_easy_setopt (ch->c, CURLOPT_PROTOCOLS_STR, protocols);
-+    curl_easy_setopt (ch->c, CURLOPT_REDIR_PROTOCOLS_STR, protocols);
-+  }
-+#endif /* HAVE_CURLOPT_PROTOCOLS_STR */
-+  if (proxy)
-+    curl_easy_setopt (ch->c, CURLOPT_PROXY, proxy);
-+  if (proxy_password)
-+    curl_easy_setopt (ch->c, CURLOPT_PROXYPASSWORD, proxy_password);
-+  if (proxy_user)
-+    curl_easy_setopt (ch->c, CURLOPT_PROXYUSERNAME, proxy_user);
-+  if (!sslverify) {
-+    curl_easy_setopt (ch->c, CURLOPT_SSL_VERIFYPEER, 0L);
-+    curl_easy_setopt (ch->c, CURLOPT_SSL_VERIFYHOST, 0L);
-+  }
-+  if (resolves)
-+    curl_easy_setopt (ch->c, CURLOPT_RESOLVE, resolves);
-+  if (ssl_version != CURL_SSLVERSION_DEFAULT)
-+    curl_easy_setopt (ch->c, CURLOPT_SSLVERSION, (long) ssl_version);
-+  if (ssl_cipher_list)
-+    curl_easy_setopt (ch->c, CURLOPT_SSL_CIPHER_LIST, ssl_cipher_list);
-+  if (tls13_ciphers) {
-+#if (LIBCURL_VERSION_MAJOR > 7) || \
-+    (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 61)
-+    curl_easy_setopt (ch->c, CURLOPT_TLS13_CIPHERS, tls13_ciphers);
-+#else
-+    /* This is not available before curl-7.61 */
-+    nbdkit_error ("tls13-ciphers is not supported in this build of "
-+                  "nbdkit-curl-plugin");
-+    goto err;
-+#endif
-+  }
-+  if (tcp_keepalive)
-+    curl_easy_setopt (ch->c, CURLOPT_TCP_KEEPALIVE, 1L);
-+  if (!tcp_nodelay)
-+    curl_easy_setopt (ch->c, CURLOPT_TCP_NODELAY, 0L);
-+  if (timeout > 0)
-+    curl_easy_setopt (ch->c, CURLOPT_TIMEOUT, (long) timeout);
-+  if (user)
-+    curl_easy_setopt (ch->c, CURLOPT_USERNAME, user);
-+  if (user_agent)
-+    curl_easy_setopt (ch->c, CURLOPT_USERAGENT, user_agent);
-+
-+  if (get_content_length_accept_range (ch) == -1)
-+    goto err;
-+
-+  /* Get set up for reading and writing. */
-+  curl_easy_setopt (ch->c, CURLOPT_HEADERFUNCTION, NULL);
-+  curl_easy_setopt (ch->c, CURLOPT_HEADERDATA, NULL);
-+  curl_easy_setopt (ch->c, CURLOPT_WRITEFUNCTION, write_cb);
-+  curl_easy_setopt (ch->c, CURLOPT_WRITEDATA, ch);
-+  /* These are only used if !readonly but we always register them. */
-+  curl_easy_setopt (ch->c, CURLOPT_READFUNCTION, read_cb);
-+  curl_easy_setopt (ch->c, CURLOPT_READDATA, ch);
-+
-+  return ch;
-+
-+ err:
-+  if (ch->c)
-+    curl_easy_cleanup (ch->c);
-+  free (ch);
-+  return NULL;
-+}
-+
-+void
-+free_handle (struct curl_handle *ch)
-+{
-+  curl_easy_cleanup (ch->c);
-+  if (ch->headers_copy)
-+    curl_slist_free_all (ch->headers_copy);
-+  free (ch);
-+}
-+
-+/* When using CURLOPT_VERBOSE, this callback is used to redirect
-+ * messages to nbdkit_debug (instead of stderr).
-+ */
-+static int
-+debug_cb (CURL *handle, curl_infotype type,
-+          const char *data, size_t size, void *opaque)
-+{
-+  size_t origsize = size;
-+  CLEANUP_FREE char *str;
-+
-+  /* The data parameter passed is NOT \0-terminated, but also it may
-+   * have \n or \r\n line endings.  The only sane way to deal with
-+   * this is to copy the string.  (The data strings may also be
-+   * multi-line, but we don't deal with that here).
-+   */
-+  str = malloc (size + 1);
-+  if (str == NULL)
-+    goto out;
-+  memcpy (str, data, size);
-+  str[size] = '\0';
-+
-+  while (size > 0 && (str[size-1] == '\n' || str[size-1] == '\r')) {
-+    str[size-1] = '\0';
-+    size--;
-+  }
-+
-+  switch (type) {
-+  case CURLINFO_TEXT:
-+    nbdkit_debug ("%s", str);
-+    break;
-+  case CURLINFO_HEADER_IN:
-+    nbdkit_debug ("S: %s", str);
-+    break;
-+  case CURLINFO_HEADER_OUT:
-+    nbdkit_debug ("C: %s", str);
-+    break;
-+  default:
-+    /* Assume everything else is binary data that we cannot print. */
-+    nbdkit_debug ("<data with size=%zu>", origsize);
-+  }
-+
-+ out:
-+  return 0;
-+}
-+
-+/* NB: The terminology used by libcurl is confusing!
-+ *
-+ * WRITEFUNCTION / write_cb is used when reading from the remote server
-+ * READFUNCTION / read_cb is used when writing to the remote server.
-+ *
-+ * We use the same terminology as libcurl here.
-+ */
-+
-+static size_t
-+write_cb (char *ptr, size_t size, size_t nmemb, void *opaque)
-+{
-+  struct curl_handle *ch = opaque;
-+  size_t orig_realsize = size * nmemb;
-+  size_t realsize = orig_realsize;
-+
-+  assert (ch->write_buf);
-+
-+  /* Don't read more than the requested amount of data, even if the
-+   * server or libcurl sends more.
-+   */
-+  if (realsize > ch->write_count)
-+    realsize = ch->write_count;
-+
-+  memcpy (ch->write_buf, ptr, realsize);
-+
-+  ch->write_count -= realsize;
-+  ch->write_buf += realsize;
-+
-+  return orig_realsize;
-+}
-+
-+static size_t
-+read_cb (void *ptr, size_t size, size_t nmemb, void *opaque)
-+{
-+  struct curl_handle *ch = opaque;
-+  size_t realsize = size * nmemb;
-+
-+  assert (ch->read_buf);
-+  if (realsize > ch->read_count)
-+    realsize = ch->read_count;
-+
-+  memcpy (ptr, ch->read_buf, realsize);
-+
-+  ch->read_count -= realsize;
-+  ch->read_buf += realsize;
-+
-+  return realsize;
-+}
-+
-+/* Get the file size and also whether the remote HTTP server
-+ * supports byte ranges.
-+ */
-+static int
-+get_content_length_accept_range (struct curl_handle *ch)
-+{
-+  CURLcode r;
-+  long code;
-+#ifdef HAVE_CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
-+  curl_off_t o;
-+#else
-+  double d;
-+#endif
-+
-+  /* We must run the scripts if necessary and set headers in the
-+   * handle.
-+   */
-+  if (do_scripts (ch) == -1)
-+    return -1;
-+
-+  /* Set this flag in the handle to false.  The callback should set it
-+   * to true if byte ranges are supported, which we check below.
-+   */
-+  ch->accept_range = false;
-+
-+  /* No Body, not nobody!  This forces a HEAD request. */
-+  curl_easy_setopt (ch->c, CURLOPT_NOBODY, 1L);
-+  curl_easy_setopt (ch->c, CURLOPT_HEADERFUNCTION, header_cb);
-+  curl_easy_setopt (ch->c, CURLOPT_HEADERDATA, ch);
-+  r = curl_easy_perform (ch->c);
-+  update_times (ch->c);
-+  if (r != CURLE_OK) {
-+    display_curl_error (ch, r,
-+                        "problem doing HEAD request to fetch size of URL [%s]",
-+                        url);
-+
-+    /* Get the HTTP status code, if available. */
-+    r = curl_easy_getinfo (ch->c, CURLINFO_RESPONSE_CODE, &code);
-+    if (r == CURLE_OK)
-+      nbdkit_debug ("HTTP status code: %ld", code);
-+    else
-+      code = -1;
-+
-+    /* See comment on try_fallback_GET_method below. */
-+    if (code != 403 || !try_fallback_GET_method (ch))
-+      return -1;
-+  }
-+
-+  /* Get the content length.
-+   *
-+   * Note there is some subtlety here: For web servers using chunked
-+   * encoding, either the Content-Length header will not be present,
-+   * or if present it should be ignored.  (For such servers the only
-+   * way to find out the true length would be to read all of the
-+   * content, which we don't want to do).
-+   *
-+   * Curl itself resolves this for us.  It will ignore the
-+   * Content-Length header if chunked encoding is used, returning the
-+   * length as -1 which we check below (see also
-+   * curl:lib/http.c:Curl_http_size).
-+   */
-+#ifdef HAVE_CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
-+  r = curl_easy_getinfo (ch->c, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &o);
-+  if (r != CURLE_OK) {
-+    display_curl_error (ch, r,
-+                        "could not get length of remote file [%s]", url);
-+    return -1;
-+  }
-+
-+  if (o == -1) {
-+    nbdkit_error ("could not get length of remote file [%s], "
-+                  "is the URL correct?", url);
-+    return -1;
-+  }
-+
-+  ch->exportsize = o;
-+#else
-+  r = curl_easy_getinfo (ch->c, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &d);
-+  if (r != CURLE_OK) {
-+    display_curl_error (ch, r,
-+                        "could not get length of remote file [%s]", url);
-+    return -1;
-+  }
-+
-+  if (d == -1) {
-+    nbdkit_error ("could not get length of remote file [%s], "
-+                  "is the URL correct?", url);
-+    return -1;
-+  }
-+
-+  ch->exportsize = d;
-+#endif
-+  nbdkit_debug ("content length: %" PRIi64, ch->exportsize);
-+
-+  /* If this is HTTP, check that byte ranges are supported. */
-+  if (ascii_strncasecmp (url, "http://", strlen ("http://")) == 0 ||
-+      ascii_strncasecmp (url, "https://", strlen ("https://")) == 0) {
-+    if (!ch->accept_range) {
-+      nbdkit_error ("server does not support 'range' (byte range) requests");
-+      return -1;
-+    }
-+
-+    nbdkit_debug ("accept range supported (for HTTP/HTTPS)");
-+  }
-+
-+  return 0;
-+}
-+
-+/* S3 servers can return 403 Forbidden for HEAD but still respond
-+ * to GET, so we give it a second chance in that case.
-+ * https://github.com/kubevirt/containerized-data-importer/issues/2737
-+ *
-+ * This function issues a GET request with a writefunction that always
-+ * returns an error, thus effectively getting the headers but
-+ * abandoning the transfer as soon as possible after.
-+ */
-+static bool
-+try_fallback_GET_method (struct curl_handle *ch)
-+{
-+  CURLcode r;
-+
-+  nbdkit_debug ("attempting to fetch headers using GET method");
-+
-+  curl_easy_setopt (ch->c, CURLOPT_HTTPGET, 1L);
-+  curl_easy_setopt (ch->c, CURLOPT_HEADERFUNCTION, header_cb);
-+  curl_easy_setopt (ch->c, CURLOPT_HEADERDATA, ch);
-+  curl_easy_setopt (ch->c, CURLOPT_WRITEFUNCTION, error_cb);
-+  curl_easy_setopt (ch->c, CURLOPT_WRITEDATA, ch);
-+  r = curl_easy_perform (ch->c);
-+  update_times (ch->c);
-+
-+  /* We expect CURLE_WRITE_ERROR here, but CURLE_OK is possible too
-+   * (eg if the remote has zero length).  Other errors might happen
-+   * but we ignore them since it is a fallback path.
-+   */
-+  return r == CURLE_OK || r == CURLE_WRITE_ERROR;
-+}
-+
-+static size_t
-+header_cb (void *ptr, size_t size, size_t nmemb, void *opaque)
-+{
-+  struct curl_handle *ch = opaque;
-+  size_t realsize = size * nmemb;
-+  const char *header = ptr;
-+  const char *end = header + realsize;
-+  const char *accept_ranges = "accept-ranges:";
-+  const char *bytes = "bytes";
-+
-+  if (realsize >= strlen (accept_ranges) &&
-+      ascii_strncasecmp (header, accept_ranges, strlen (accept_ranges)) == 0) {
-+    const char *p = strchr (header, ':') + 1;
-+
-+    /* Skip whitespace between the header name and value. */
-+    while (p < end && *p && ascii_isspace (*p))
-+      p++;
-+
-+    if (end - p >= strlen (bytes)
-+        && strncmp (p, bytes, strlen (bytes)) == 0) {
-+      /* Check that there is nothing but whitespace after the value. */
-+      p += strlen (bytes);
-+      while (p < end && *p && ascii_isspace (*p))
-+        p++;
-+
-+      if (p == end || !*p)
-+        ch->accept_range = true;
-+    }
-+  }
-+
-+  return realsize;
-+}
-+
-+static size_t
-+error_cb (char *ptr, size_t size, size_t nmemb, void *opaque)
-+{
-+#ifdef CURL_WRITEFUNC_ERROR
-+  return CURL_WRITEFUNC_ERROR;
-+#else
-+  return 0; /* in older curl, any size < requested will also be an error */
-+#endif
-+}
-diff --git a/plugins/curl/curl.c b/plugins/curl/curl.c
-index 0d1fcfee..99a7e00b 100644
---- a/plugins/curl/curl.c
-+++ b/plugins/curl/curl.c
-@@ -52,46 +52,10 @@
- 
- #include "curldefs.h"
- 
--/* Plugin configuration. */
--const char *url = NULL;         /* required */
--
--const char *cainfo = NULL;
--const char *capath = NULL;
--unsigned connections = 4;
--char *cookie = NULL;
--const char *cookiefile = NULL;
--const char *cookiejar = NULL;
- const char *cookie_script = NULL;
- unsigned cookie_script_renew = 0;
--bool followlocation = true;
--struct curl_slist *headers = NULL;
- const char *header_script = NULL;
- unsigned header_script_renew = 0;
--long http_version = CURL_HTTP_VERSION_NONE;
--long ipresolve = CURL_IPRESOLVE_WHATEVER;
--char *password = NULL;
--#ifndef HAVE_CURLOPT_PROTOCOLS_STR
--long protocols = CURLPROTO_ALL;
--#else
--const char *protocols = NULL;
--#endif
--const char *proxy = NULL;
--char *proxy_password = NULL;
--const char *proxy_user = NULL;
--struct curl_slist *resolves = NULL;
--bool sslverify = true;
--const char *ssl_cipher_list = NULL;
--long ssl_version = CURL_SSLVERSION_DEFAULT;
--const char *tls13_ciphers = NULL;
--bool tcp_keepalive = false;
--bool tcp_nodelay = true;
--uint32_t timeout = 0;
--const char *unix_socket_path = NULL;
--const char *user = NULL;
--const char *user_agent = NULL;
--
--/* Use '-D curl.verbose=1' to set. */
--NBDKIT_DLL_PUBLIC int curl_debug_verbose = 0;
- 
- static void
- curl_load (void)
-@@ -110,438 +74,13 @@ curl_load (void)
- static void
- curl_unload (void)
- {
--  free (cookie);
--  if (headers)
--    curl_slist_free_all (headers);
--  free (password);
--  free (proxy_password);
--  if (resolves)
--    curl_slist_free_all (resolves);
-+  unload_config ();
-   scripts_unload ();
-   unload_pool ();
-   display_times ();
-   curl_global_cleanup ();
- }
- 
--#ifndef HAVE_CURLOPT_PROTOCOLS_STR
--/* See <curl/curl.h> */
--static struct { const char *name; long bitmask; } curl_protocols[] = {
--  { "http", CURLPROTO_HTTP },
--  { "https", CURLPROTO_HTTPS },
--  { "ftp", CURLPROTO_FTP },
--  { "ftps", CURLPROTO_FTPS },
--  { "scp", CURLPROTO_SCP },
--  { "sftp", CURLPROTO_SFTP },
--  { "telnet", CURLPROTO_TELNET },
--  { "ldap", CURLPROTO_LDAP },
--  { "ldaps", CURLPROTO_LDAPS },
--  { "dict", CURLPROTO_DICT },
--  { "file", CURLPROTO_FILE },
--  { "tftp", CURLPROTO_TFTP },
--  { "imap", CURLPROTO_IMAP },
--  { "imaps", CURLPROTO_IMAPS },
--  { "pop3", CURLPROTO_POP3 },
--  { "pop3s", CURLPROTO_POP3S },
--  { "smtp", CURLPROTO_SMTP },
--  { "smtps", CURLPROTO_SMTPS },
--  { "rtsp", CURLPROTO_RTSP },
--  { "rtmp", CURLPROTO_RTMP },
--  { "rtmpt", CURLPROTO_RTMPT },
--  { "rtmpe", CURLPROTO_RTMPE },
--  { "rtmpte", CURLPROTO_RTMPTE },
--  { "rtmps", CURLPROTO_RTMPS },
--  { "rtmpts", CURLPROTO_RTMPTS },
--  { "gopher", CURLPROTO_GOPHER },
--#ifdef CURLPROTO_SMB
--  { "smb", CURLPROTO_SMB },
--#endif
--#ifdef CURLPROTO_SMBS
--  { "smbs", CURLPROTO_SMBS },
--#endif
--#ifdef CURLPROTO_MQTT
--  { "mqtt", CURLPROTO_MQTT },
--#endif
--  { NULL }
--};
--
--/* Parse the protocols parameter. */
--static int
--parse_protocols (const char *value)
--{
--  size_t n, i;
--
--  protocols = 0;
--
--  while (*value) {
--    n = strcspn (value, ",");
--    for (i = 0; curl_protocols[i].name != NULL; ++i) {
--      if (strlen (curl_protocols[i].name) == n &&
--          strncmp (value, curl_protocols[i].name, n) == 0) {
--        protocols |= curl_protocols[i].bitmask;
--        goto found;
--      }
--    }
--    nbdkit_error ("protocols: protocol name not found: %.*s", (int) n, value);
--    return -1;
--
--  found:
--    value += n;
--    if (*value == ',')
--      value++;
--  }
--
--  if (protocols == 0) {
--    nbdkit_error ("protocols: empty list of protocols is not allowed");
--    return -1;
--  }
--
--  nbdkit_debug ("curl: protocols: %ld", protocols);
--
--  return 0;
--}
--#endif /* !HAVE_CURLOPT_PROTOCOLS_STR */
--
--/* Called for each key=value passed on the command line. */
--static int
--curl_config (const char *key, const char *value)
--{
--  int r;
--
--  if (strcmp (key, "cainfo") == 0) {
--    cainfo = value;
--  }
--
--  else if (strcmp (key, "capath") == 0) {
--    capath =  value;
--  }
--
--  else if (strcmp (key, "connections") == 0) {
--    if (nbdkit_parse_unsigned ("connections", value,
--                               &connections) == -1)
--      return -1;
--    if (connections == 0) {
--      nbdkit_error ("connections parameter must not be 0");
--      return -1;
--    }
--  }
--
--  else if (strcmp (key, "cookie") == 0) {
--    free (cookie);
--    if (nbdkit_read_password (value, &cookie) == -1)
--      return -1;
--  }
--
--  else if (strcmp (key, "cookiefile") == 0) {
--    /* Reject cookiefile=- because it will cause libcurl to try to
--     * read from stdin when we connect.
--     */
--    if (strcmp (value, "-") == 0) {
--      nbdkit_error ("cookiefile parameter cannot be \"-\"");
--      return -1;
--    }
--    cookiefile = value;
--  }
--
--  else if (strcmp (key, "cookiejar") == 0) {
--    /* Reject cookiejar=- because it will cause libcurl to try to
--     * write to stdout.
--     */
--    if (strcmp (value, "-") == 0) {
--      nbdkit_error ("cookiejar parameter cannot be \"-\"");
--      return -1;
--    }
--    cookiejar = value;
--  }
--
--  else if (strcmp (key, "cookie-script") == 0) {
--    cookie_script = value;
--  }
--
--  else if (strcmp (key, "cookie-script-renew") == 0) {
--    if (nbdkit_parse_unsigned ("cookie-script-renew", value,
--                               &cookie_script_renew) == -1)
--      return -1;
--  }
--
--  else if (strcmp (key, "followlocation") == 0) {
--    r = nbdkit_parse_bool (value);
--    if (r == -1)
--      return -1;
--    followlocation = r;
--  }
--
--  else if (strcmp (key, "header") == 0) {
--    headers = curl_slist_append (headers, value);
--    if (headers == NULL) {
--      nbdkit_error ("curl_slist_append: %m");
--      return -1;
--    }
--  }
--
--  else if (strcmp (key, "header-script") == 0) {
--    header_script = value;
--  }
--
--  else if (strcmp (key, "header-script-renew") == 0) {
--    if (nbdkit_parse_unsigned ("header-script-renew", value,
--                               &header_script_renew) == -1)
--      return -1;
--  }
--
--  else if (strcmp (key, "http-version") == 0) {
--    if (strcmp (value, "none") == 0)
--      http_version = CURL_HTTP_VERSION_NONE;
--    else if (strcmp (value, "1.0") == 0)
--      http_version = CURL_HTTP_VERSION_1_0;
--    else if (strcmp (value, "1.1") == 0)
--      http_version = CURL_HTTP_VERSION_1_1;
--#ifdef HAVE_CURL_HTTP_VERSION_2_0
--    else if (strcmp (value, "2.0") == 0)
--      http_version = CURL_HTTP_VERSION_2_0;
--#endif
--#ifdef HAVE_CURL_HTTP_VERSION_2TLS
--    else if (strcmp (value, "2TLS") == 0)
--      http_version = CURL_HTTP_VERSION_2TLS;
--#endif
--#ifdef HAVE_CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE
--    else if (strcmp (value, "2-prior-knowledge") == 0)
--      http_version = CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE;
--#endif
--#ifdef HAVE_CURL_HTTP_VERSION_3
--    else if (strcmp (value, "3") == 0)
--      http_version = CURL_HTTP_VERSION_3;
--#endif
--#ifdef HAVE_CURL_HTTP_VERSION_3ONLY
--    else if (strcmp (value, "3only") == 0)
--      http_version = CURL_HTTP_VERSION_3ONLY;
--#endif
--    else {
--      nbdkit_error ("unknown http-version: %s", value);
--      return -1;
--    }
--  }
--
--  else if (strcmp (key, "ipresolve") == 0) {
--    if (strcmp (value, "any") == 0 || strcmp (value, "whatever") == 0)
--      ipresolve = CURL_IPRESOLVE_WHATEVER;
--    else if (strcmp (value, "v4") == 0 || strcmp (value, "4") == 0)
--      ipresolve = CURL_IPRESOLVE_V4;
--    else if (strcmp (value, "v6") == 0 || strcmp (value, "6") == 0)
--      ipresolve = CURL_IPRESOLVE_V6;
--    else {
--      nbdkit_error ("unknown ipresolve: %s", value);
--      return -1;
--    }
--  }
--
--  else if (strcmp (key, "password") == 0) {
--    free (password);
--    if (nbdkit_read_password (value, &password) == -1)
--      return -1;
--  }
--
--  else if (strcmp (key, "protocols") == 0) {
--#ifndef HAVE_CURLOPT_PROTOCOLS_STR
--    if (parse_protocols (value) == -1)
--      return -1;
--#else
--    protocols = value;
--#endif
--  }
--
--  else if (strcmp (key, "proxy") == 0) {
--    proxy = value;
--  }
--
--  else if (strcmp (key, "proxy-password") == 0) {
--    free (proxy_password);
--    if (nbdkit_read_password (value, &proxy_password) == -1)
--      return -1;
--  }
--
--  else if (strcmp (key, "proxy-user") == 0)
--    proxy_user = value;
--
--  else if (strcmp (key, "resolve") == 0) {
--    resolves = curl_slist_append (headers, value);
--    if (resolves == NULL) {
--      nbdkit_error ("curl_slist_append: %m");
--      return -1;
--    }
--  }
--
--  else if (strcmp (key, "sslverify") == 0) {
--    r = nbdkit_parse_bool (value);
--    if (r == -1)
--      return -1;
--    sslverify = r;
--  }
--
--  else if (strcmp (key, "ssl-version") == 0) {
--    if (strcmp (value, "default") == 0)
--      ssl_version = CURL_SSLVERSION_DEFAULT;
--    else if (strcmp (value, "tlsv1") == 0)
--      ssl_version = CURL_SSLVERSION_TLSv1;
--    else if (strcmp (value, "sslv2") == 0)
--      ssl_version = CURL_SSLVERSION_SSLv2;
--    else if (strcmp (value, "sslv3") == 0)
--      ssl_version = CURL_SSLVERSION_SSLv3;
--    else if (strcmp (value, "tlsv1.0") == 0)
--      ssl_version = CURL_SSLVERSION_TLSv1_0;
--    else if (strcmp (value, "tlsv1.1") == 0)
--      ssl_version = CURL_SSLVERSION_TLSv1_1;
--    else if (strcmp (value, "tlsv1.2") == 0)
--      ssl_version = CURL_SSLVERSION_TLSv1_2;
--    else if (strcmp (value, "tlsv1.3") == 0)
--      ssl_version = CURL_SSLVERSION_TLSv1_3;
--#ifdef HAVE_CURL_SSLVERSION_MAX_DEFAULT
--    else if (strcmp (value, "max-default") == 0)
--      ssl_version = CURL_SSLVERSION_MAX_DEFAULT;
--#endif
--#ifdef HAVE_CURL_SSLVERSION_MAX_TLSv1_0
--    else if (strcmp (value, "max-tlsv1.0") == 0)
--      ssl_version = CURL_SSLVERSION_MAX_TLSv1_0;
--#endif
--#ifdef HAVE_CURL_SSLVERSION_MAX_TLSv1_1
--    else if (strcmp (value, "max-tlsv1.1") == 0)
--      ssl_version = CURL_SSLVERSION_MAX_TLSv1_1;
--#endif
--#ifdef HAVE_CURL_SSLVERSION_MAX_TLSv1_2
--    else if (strcmp (value, "max-tlsv1.2") == 0)
--      ssl_version = CURL_SSLVERSION_MAX_TLSv1_2;
--#endif
--#ifdef HAVE_CURL_SSLVERSION_MAX_TLSv1_3
--    else if (strcmp (value, "max-tlsv1.3") == 0)
--      ssl_version = CURL_SSLVERSION_MAX_TLSv1_3;
--#endif
--    else {
--      nbdkit_error ("unknown ssl-version: %s", value);
--      return -1;
--    }
--  }
--
--  else if (strcmp (key, "ssl-cipher-list") == 0)
--    ssl_cipher_list = value;
--
--  else if (strcmp (key, "tls13-ciphers") == 0)
--    tls13_ciphers = value;
--
--  else if (strcmp (key, "tcp-keepalive") == 0) {
--    r = nbdkit_parse_bool (value);
--    if (r == -1)
--      return -1;
--    tcp_keepalive = r;
--  }
--
--  else if (strcmp (key, "tcp-nodelay") == 0) {
--    r = nbdkit_parse_bool (value);
--    if (r == -1)
--      return -1;
--    tcp_nodelay = r;
--  }
--
--  else if (strcmp (key, "timeout") == 0) {
--    if (nbdkit_parse_uint32_t ("timeout", value, &timeout) == -1)
--      return -1;
--#if LONG_MAX < UINT32_MAX
--    /* C17 5.2.4.2.1 requires that LONG_MAX is at least 2^31 - 1.
--     * However a large positive number might still exceed the limit.
--     */
--    if (timeout > LONG_MAX) {
--      nbdkit_error ("timeout is too large");
--      return -1;
--    }
--#endif
--  }
--
--  else if (strcmp (key, "unix-socket-path") == 0 ||
--           strcmp (key, "unix_socket_path") == 0)
--    unix_socket_path = value;
--
--  else if (strcmp (key, "url") == 0)
--    url = value;
--
--  else if (strcmp (key, "user") == 0)
--    user = value;
--
--  else if (strcmp (key, "user-agent") == 0)
--    user_agent = value;
--
--  else {
--    nbdkit_error ("unknown parameter '%s'", key);
--    return -1;
--  }
--
--  return 0;
--}
--
--/* Check the user did pass a url parameter. */
--static int
--curl_config_complete (void)
--{
--  if (url == NULL) {
--    nbdkit_error ("you must supply the url=<URL> parameter "
--                  "after the plugin name on the command line");
--    return -1;
--  }
--
--  if (headers && header_script) {
--    nbdkit_error ("header and header-script cannot be used at the same time");
--    return -1;
--  }
--
--  if (!header_script && header_script_renew) {
--    nbdkit_error ("header-script-renew cannot be used without header-script");
--    return -1;
--  }
--
--  if (cookie && cookie_script) {
--    nbdkit_error ("cookie and cookie-script cannot be used at the same time");
--    return -1;
--  }
--
--  if (!cookie_script && cookie_script_renew) {
--    nbdkit_error ("cookie-script-renew cannot be used without cookie-script");
--    return -1;
--  }
--
--  return 0;
--}
--
--#define curl_config_help \
--  "cainfo=<CAINFO>            Path to Certificate Authority file.\n" \
--  "capath=<CAPATH>            Path to directory with CA certificates.\n" \
--  "connections=<N>            Number of libcurl connections to use.\n" \
--  "cookie=<COOKIE>            Set HTTP/HTTPS cookies.\n" \
--  "cookiefile=                Enable cookie processing.\n" \
--  "cookiefile=<FILENAME>      Read cookies from file.\n" \
--  "cookiejar=<FILENAME>       Read and write cookies to jar.\n" \
--  "cookie-script=<SCRIPT>     Script to set HTTP/HTTPS cookies.\n" \
--  "cookie-script-renew=<SECS> Time to renew HTTP/HTTPS cookies.\n" \
--  "followlocation=false       Do not follow redirects.\n" \
--  "header=<HEADER>            Set HTTP/HTTPS header.\n" \
--  "header-script=<SCRIPT>     Script to set HTTP/HTTPS headers.\n" \
--  "header-script-renew=<SECS> Time to renew HTTP/HTTPS headers.\n" \
--  "http-version=none|...      Force a particular HTTP protocol.\n" \
--  "ipresolve=any|v4|v6        Force IPv4 or IPv6.\n" \
--  "password=<PASSWORD>        The password for the user account.\n" \
--  "protocols=PROTO,PROTO,..   Limit protocols allowed.\n" \
--  "proxy=<PROXY>              Set proxy URL.\n" \
--  "proxy-password=<PASSWORD>  The proxy password.\n" \
--  "proxy-user=<USER>          The proxy user.\n" \
--  "resolve=<HOST>:<PORT>:<ADDR> Custom host to IP address resolution.\n" \
--  "sslverify=false            Do not verify SSL certificate of remote host.\n" \
--  "ssl-cipher-list=C1:C2:..   Specify TLS/SSL cipher suites to be used.\n" \
--  "ssl-version=<VERSION>      Specify preferred TLS/SSL version.\n" \
--  "tcp-keepalive=true         Enable TCP keepalives.\n" \
--  "tcp-nodelay=false          Disable Nagle’s algorithm.\n" \
--  "timeout=<TIMEOUT>          Set the timeout for requests (seconds).\n" \
--  "tls13-ciphers=C1:C2:..     Specify TLS 1.3 cipher suites to be used.\n" \
--  "unix-socket-path=<PATH>    Open Unix domain socket instead of TCP/IP.\n" \
--  "url=<URL>       (required) The disk image URL to serve.\n" \
--  "user=<USER>                The user to log in as.\n" \
--  "user-agent=<USER-AGENT>    Send user-agent header for HTTP/HTTPS."
--
- /* Create the per-connection handle. */
- static void *
- curl_open (int readonly)
-@@ -704,7 +243,11 @@ static struct nbdkit_plugin plugin = {
-   .unload            = curl_unload,
-   .config            = curl_config,
-   .config_complete   = curl_config_complete,
--  .config_help       = curl_config_help,
-+  /* We can't set this here because of an obscure corner of the C
-+   * language.  "error: initializer element is not constant".  See
-+   * https://stackoverflow.com/questions/3025050
-+   */
-+  //.config_help       = curl_config_help,
-   .magic_config_key  = "url",
-   .open              = curl_open,
-   .close             = curl_close,
-@@ -714,4 +257,11 @@ static struct nbdkit_plugin plugin = {
-   .pwrite            = curl_pwrite,
- };
- 
-+static void set_help (void) __attribute__ ((constructor));
-+static void
-+set_help (void)
-+{
-+  plugin.config_help = curl_config_help;
-+}
-+
- NBDKIT_REGISTER_PLUGIN (plugin)
-diff --git a/plugins/curl/curldefs.h b/plugins/curl/curldefs.h
-index dd9791aa..9169b256 100644
---- a/plugins/curl/curldefs.h
-+++ b/plugins/curl/curldefs.h
-@@ -57,40 +57,12 @@
- 
- extern const char *url;
- 
--extern const char *cainfo;
--extern const char *capath;
- extern unsigned connections;
--extern char *cookie;
--extern const char *cookiefile;
--extern const char *cookiejar;
-+
- extern const char *cookie_script;
- extern unsigned cookie_script_renew;
--extern bool followlocation;
--extern struct curl_slist *headers;
- extern const char *header_script;
- extern unsigned header_script_renew;
--extern long http_version;
--extern long ipresolve;
--extern char *password;
--#ifndef HAVE_CURLOPT_PROTOCOLS_STR
--extern long protocols;
--#else
--extern const char *protocols;
--#endif
--extern const char *proxy;
--extern char *proxy_password;
--extern const char *proxy_user;
--extern bool sslverify;
--extern const char *ssl_cipher_list;
--extern long ssl_version;
--extern struct curl_slist *resolves;
--extern const char *tls13_ciphers;
--extern bool tcp_keepalive;
--extern bool tcp_nodelay;
--extern uint32_t timeout;
--extern const char *unix_socket_path;
--extern const char *user;
--extern const char *user_agent;
- 
- extern int curl_debug_verbose;
- 
-@@ -130,6 +102,14 @@ struct curl_handle {
-   struct curl_slist *headers_copy;
- };
- 
-+/* config.c */
-+extern int curl_config (const char *key, const char *value);
-+extern int curl_config_complete (void);
-+extern const char *curl_config_help;
-+extern void unload_config (void);
-+extern struct curl_handle *allocate_handle (void);
-+extern void free_handle (struct curl_handle *);
-+
- /* pool.c */
- extern void load_pool (void);
- extern void unload_pool (void);
-diff --git a/plugins/curl/pool.c b/plugins/curl/pool.c
-index 8db69a71..91e56f07 100644
---- a/plugins/curl/pool.c
-+++ b/plugins/curl/pool.c
-@@ -52,8 +52,6 @@
- 
- #include <nbdkit-plugin.h>
- 
--#include "ascii-ctype.h"
--#include "ascii-string.h"
- #include "cleanup.h"
- #include "vector.h"
- 
-@@ -62,16 +60,7 @@
- /* Use '-D curl.pool=1' to debug handle pool. */
- NBDKIT_DLL_PUBLIC int curl_debug_pool = 0;
- 
--static struct curl_handle *allocate_handle (void);
--static void free_handle (struct curl_handle *);
--static int debug_cb (CURL *handle, curl_infotype type,
--                     const char *data, size_t size, void *);
--static size_t write_cb (char *ptr, size_t size, size_t nmemb, void *opaque);
--static size_t read_cb (void *ptr, size_t size, size_t nmemb, void *opaque);
--static int get_content_length_accept_range (struct curl_handle *ch);
--static bool try_fallback_GET_method (struct curl_handle *ch);
--static size_t header_cb (void *ptr, size_t size, size_t nmemb, void *opaque);
--static size_t error_cb (char *ptr, size_t size, size_t nmemb, void *opaque);
-+unsigned connections = 4;
- 
- /* This lock protects access to the curl_handles vector below. */
- static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
-@@ -179,445 +168,3 @@ put_handle (struct curl_handle *ch)
-   if (waiting > 0)
-     pthread_cond_signal (&cond);
- }
--
--/* Allocate and initialize a new libcurl handle. */
--static struct curl_handle *
--allocate_handle (void)
--{
--  struct curl_handle *ch;
--  CURLcode r;
--
--  ch = calloc (1, sizeof *ch);
--  if (ch == NULL) {
--    nbdkit_error ("calloc: %m");
--    free (ch);
--    return NULL;
--  }
--
--  ch->c = curl_easy_init ();
--  if (ch->c == NULL) {
--    nbdkit_error ("curl_easy_init: failed: %m");
--    goto err;
--  }
--
--  if (curl_debug_verbose) {
--    /* NB: Constants must be explicitly long because the parameter is
--     * varargs.
--     */
--    curl_easy_setopt (ch->c, CURLOPT_VERBOSE, 1L);
--    curl_easy_setopt (ch->c, CURLOPT_DEBUGFUNCTION, debug_cb);
--  }
--
--  curl_easy_setopt (ch->c, CURLOPT_ERRORBUFFER, ch->errbuf);
--
--  r = CURLE_OK;
--  if (unix_socket_path) {
--#if HAVE_CURLOPT_UNIX_SOCKET_PATH
--    r = curl_easy_setopt (ch->c, CURLOPT_UNIX_SOCKET_PATH, unix_socket_path);
--#else
--    r = CURLE_UNKNOWN_OPTION;
--#endif
--  }
--  if (r != CURLE_OK) {
--    display_curl_error (ch, r, "curl_easy_setopt: CURLOPT_UNIX_SOCKET_PATH");
--    goto err;
--  }
--
--  /* Set the URL. */
--  r = curl_easy_setopt (ch->c, CURLOPT_URL, url);
--  if (r != CURLE_OK) {
--    display_curl_error (ch, r, "curl_easy_setopt: CURLOPT_URL [%s]", url);
--    goto err;
--  }
--
--  /* Various options we always set.
--   *
--   * NB: Both here and below constants must be explicitly long because
--   * the parameter is varargs.
--   *
--   * For use of CURLOPT_NOSIGNAL see:
--   * https://curl.se/libcurl/c/CURLOPT_NOSIGNAL.html
--   */
--  curl_easy_setopt (ch->c, CURLOPT_NOSIGNAL, 1L);
--  curl_easy_setopt (ch->c, CURLOPT_AUTOREFERER, 1L);
--  if (followlocation)
--    curl_easy_setopt (ch->c, CURLOPT_FOLLOWLOCATION, 1L);
--  curl_easy_setopt (ch->c, CURLOPT_FAILONERROR, 1L);
--
--  /* Options. */
--  if (cainfo) {
--    if (strlen (cainfo) == 0)
--      curl_easy_setopt (ch->c, CURLOPT_CAINFO, NULL);
--    else
--      curl_easy_setopt (ch->c, CURLOPT_CAINFO, cainfo);
--  }
--  if (capath)
--    curl_easy_setopt (ch->c, CURLOPT_CAPATH, capath);
--  if (cookie)
--    curl_easy_setopt (ch->c, CURLOPT_COOKIE, cookie);
--  if (cookiefile)
--    curl_easy_setopt (ch->c, CURLOPT_COOKIEFILE, cookiefile);
--  if (cookiejar)
--    curl_easy_setopt (ch->c, CURLOPT_COOKIEJAR, cookiejar);
--  if (headers)
--    curl_easy_setopt (ch->c, CURLOPT_HTTPHEADER, headers);
--  if (http_version != CURL_HTTP_VERSION_NONE)
--    curl_easy_setopt (ch->c, CURLOPT_HTTP_VERSION, (long) http_version);
--  if (ipresolve != CURL_IPRESOLVE_WHATEVER)
--    curl_easy_setopt (ch->c, CURLOPT_IPRESOLVE, (long) ipresolve);
--
--  if (password)
--    curl_easy_setopt (ch->c, CURLOPT_PASSWORD, password);
--#ifndef HAVE_CURLOPT_PROTOCOLS_STR
--  if (protocols != CURLPROTO_ALL) {
--    curl_easy_setopt (ch->c, CURLOPT_PROTOCOLS, protocols);
--    curl_easy_setopt (ch->c, CURLOPT_REDIR_PROTOCOLS, protocols);
--  }
--#else /* HAVE_CURLOPT_PROTOCOLS_STR (new in 7.85.0) */
--  if (protocols) {
--    curl_easy_setopt (ch->c, CURLOPT_PROTOCOLS_STR, protocols);
--    curl_easy_setopt (ch->c, CURLOPT_REDIR_PROTOCOLS_STR, protocols);
--  }
--#endif /* HAVE_CURLOPT_PROTOCOLS_STR */
--  if (proxy)
--    curl_easy_setopt (ch->c, CURLOPT_PROXY, proxy);
--  if (proxy_password)
--    curl_easy_setopt (ch->c, CURLOPT_PROXYPASSWORD, proxy_password);
--  if (proxy_user)
--    curl_easy_setopt (ch->c, CURLOPT_PROXYUSERNAME, proxy_user);
--  if (!sslverify) {
--    curl_easy_setopt (ch->c, CURLOPT_SSL_VERIFYPEER, 0L);
--    curl_easy_setopt (ch->c, CURLOPT_SSL_VERIFYHOST, 0L);
--  }
--  if (resolves)
--    curl_easy_setopt (ch->c, CURLOPT_RESOLVE, resolves);
--  if (ssl_version != CURL_SSLVERSION_DEFAULT)
--    curl_easy_setopt (ch->c, CURLOPT_SSLVERSION, (long) ssl_version);
--  if (ssl_cipher_list)
--    curl_easy_setopt (ch->c, CURLOPT_SSL_CIPHER_LIST, ssl_cipher_list);
--  if (tls13_ciphers) {
--#if (LIBCURL_VERSION_MAJOR > 7) || \
--    (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 61)
--    curl_easy_setopt (ch->c, CURLOPT_TLS13_CIPHERS, tls13_ciphers);
--#else
--    /* This is not available before curl-7.61 */
--    nbdkit_error ("tls13-ciphers is not supported in this build of "
--                  "nbdkit-curl-plugin");
--    goto err;
--#endif
--  }
--  if (tcp_keepalive)
--    curl_easy_setopt (ch->c, CURLOPT_TCP_KEEPALIVE, 1L);
--  if (!tcp_nodelay)
--    curl_easy_setopt (ch->c, CURLOPT_TCP_NODELAY, 0L);
--  if (timeout > 0)
--    curl_easy_setopt (ch->c, CURLOPT_TIMEOUT, (long) timeout);
--  if (user)
--    curl_easy_setopt (ch->c, CURLOPT_USERNAME, user);
--  if (user_agent)
--    curl_easy_setopt (ch->c, CURLOPT_USERAGENT, user_agent);
--
--  if (get_content_length_accept_range (ch) == -1)
--    goto err;
--
--  /* Get set up for reading and writing. */
--  curl_easy_setopt (ch->c, CURLOPT_HEADERFUNCTION, NULL);
--  curl_easy_setopt (ch->c, CURLOPT_HEADERDATA, NULL);
--  curl_easy_setopt (ch->c, CURLOPT_WRITEFUNCTION, write_cb);
--  curl_easy_setopt (ch->c, CURLOPT_WRITEDATA, ch);
--  /* These are only used if !readonly but we always register them. */
--  curl_easy_setopt (ch->c, CURLOPT_READFUNCTION, read_cb);
--  curl_easy_setopt (ch->c, CURLOPT_READDATA, ch);
--
--  return ch;
--
-- err:
--  if (ch->c)
--    curl_easy_cleanup (ch->c);
--  free (ch);
--  return NULL;
--}
--
--static void
--free_handle (struct curl_handle *ch)
--{
--  curl_easy_cleanup (ch->c);
--  if (ch->headers_copy)
--    curl_slist_free_all (ch->headers_copy);
--  free (ch);
--}
--
--/* When using CURLOPT_VERBOSE, this callback is used to redirect
-- * messages to nbdkit_debug (instead of stderr).
-- */
--static int
--debug_cb (CURL *handle, curl_infotype type,
--          const char *data, size_t size, void *opaque)
--{
--  size_t origsize = size;
--  CLEANUP_FREE char *str;
--
--  /* The data parameter passed is NOT \0-terminated, but also it may
--   * have \n or \r\n line endings.  The only sane way to deal with
--   * this is to copy the string.  (The data strings may also be
--   * multi-line, but we don't deal with that here).
--   */
--  str = malloc (size + 1);
--  if (str == NULL)
--    goto out;
--  memcpy (str, data, size);
--  str[size] = '\0';
--
--  while (size > 0 && (str[size-1] == '\n' || str[size-1] == '\r')) {
--    str[size-1] = '\0';
--    size--;
--  }
--
--  switch (type) {
--  case CURLINFO_TEXT:
--    nbdkit_debug ("%s", str);
--    break;
--  case CURLINFO_HEADER_IN:
--    nbdkit_debug ("S: %s", str);
--    break;
--  case CURLINFO_HEADER_OUT:
--    nbdkit_debug ("C: %s", str);
--    break;
--  default:
--    /* Assume everything else is binary data that we cannot print. */
--    nbdkit_debug ("<data with size=%zu>", origsize);
--  }
--
-- out:
--  return 0;
--}
--
--/* NB: The terminology used by libcurl is confusing!
-- *
-- * WRITEFUNCTION / write_cb is used when reading from the remote server
-- * READFUNCTION / read_cb is used when writing to the remote server.
-- *
-- * We use the same terminology as libcurl here.
-- */
--
--static size_t
--write_cb (char *ptr, size_t size, size_t nmemb, void *opaque)
--{
--  struct curl_handle *ch = opaque;
--  size_t orig_realsize = size * nmemb;
--  size_t realsize = orig_realsize;
--
--  assert (ch->write_buf);
--
--  /* Don't read more than the requested amount of data, even if the
--   * server or libcurl sends more.
--   */
--  if (realsize > ch->write_count)
--    realsize = ch->write_count;
--
--  memcpy (ch->write_buf, ptr, realsize);
--
--  ch->write_count -= realsize;
--  ch->write_buf += realsize;
--
--  return orig_realsize;
--}
--
--static size_t
--read_cb (void *ptr, size_t size, size_t nmemb, void *opaque)
--{
--  struct curl_handle *ch = opaque;
--  size_t realsize = size * nmemb;
--
--  assert (ch->read_buf);
--  if (realsize > ch->read_count)
--    realsize = ch->read_count;
--
--  memcpy (ptr, ch->read_buf, realsize);
--
--  ch->read_count -= realsize;
--  ch->read_buf += realsize;
--
--  return realsize;
--}
--
--/* Get the file size and also whether the remote HTTP server
-- * supports byte ranges.
-- */
--static int
--get_content_length_accept_range (struct curl_handle *ch)
--{
--  CURLcode r;
--  long code;
--#ifdef HAVE_CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
--  curl_off_t o;
--#else
--  double d;
--#endif
--
--  /* We must run the scripts if necessary and set headers in the
--   * handle.
--   */
--  if (do_scripts (ch) == -1)
--    return -1;
--
--  /* Set this flag in the handle to false.  The callback should set it
--   * to true if byte ranges are supported, which we check below.
--   */
--  ch->accept_range = false;
--
--  /* No Body, not nobody!  This forces a HEAD request. */
--  curl_easy_setopt (ch->c, CURLOPT_NOBODY, 1L);
--  curl_easy_setopt (ch->c, CURLOPT_HEADERFUNCTION, header_cb);
--  curl_easy_setopt (ch->c, CURLOPT_HEADERDATA, ch);
--  r = curl_easy_perform (ch->c);
--  update_times (ch->c);
--  if (r != CURLE_OK) {
--    display_curl_error (ch, r,
--                        "problem doing HEAD request to fetch size of URL [%s]",
--                        url);
--
--    /* Get the HTTP status code, if available. */
--    r = curl_easy_getinfo (ch->c, CURLINFO_RESPONSE_CODE, &code);
--    if (r == CURLE_OK)
--      nbdkit_debug ("HTTP status code: %ld", code);
--    else
--      code = -1;
--
--    /* See comment on try_fallback_GET_method below. */
--    if (code != 403 || !try_fallback_GET_method (ch))
--      return -1;
--  }
--
--  /* Get the content length.
--   *
--   * Note there is some subtlety here: For web servers using chunked
--   * encoding, either the Content-Length header will not be present,
--   * or if present it should be ignored.  (For such servers the only
--   * way to find out the true length would be to read all of the
--   * content, which we don't want to do).
--   *
--   * Curl itself resolves this for us.  It will ignore the
--   * Content-Length header if chunked encoding is used, returning the
--   * length as -1 which we check below (see also
--   * curl:lib/http.c:Curl_http_size).
--   */
--#ifdef HAVE_CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
--  r = curl_easy_getinfo (ch->c, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &o);
--  if (r != CURLE_OK) {
--    display_curl_error (ch, r,
--                        "could not get length of remote file [%s]", url);
--    return -1;
--  }
--
--  if (o == -1) {
--    nbdkit_error ("could not get length of remote file [%s], "
--                  "is the URL correct?", url);
--    return -1;
--  }
--
--  ch->exportsize = o;
--#else
--  r = curl_easy_getinfo (ch->c, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &d);
--  if (r != CURLE_OK) {
--    display_curl_error (ch, r,
--                        "could not get length of remote file [%s]", url);
--    return -1;
--  }
--
--  if (d == -1) {
--    nbdkit_error ("could not get length of remote file [%s], "
--                  "is the URL correct?", url);
--    return -1;
--  }
--
--  ch->exportsize = d;
--#endif
--  nbdkit_debug ("content length: %" PRIi64, ch->exportsize);
--
--  /* If this is HTTP, check that byte ranges are supported. */
--  if (ascii_strncasecmp (url, "http://", strlen ("http://")) == 0 ||
--      ascii_strncasecmp (url, "https://", strlen ("https://")) == 0) {
--    if (!ch->accept_range) {
--      nbdkit_error ("server does not support 'range' (byte range) requests");
--      return -1;
--    }
--
--    nbdkit_debug ("accept range supported (for HTTP/HTTPS)");
--  }
--
--  return 0;
--}
--
--/* S3 servers can return 403 Forbidden for HEAD but still respond
-- * to GET, so we give it a second chance in that case.
-- * https://github.com/kubevirt/containerized-data-importer/issues/2737
-- *
-- * This function issues a GET request with a writefunction that always
-- * returns an error, thus effectively getting the headers but
-- * abandoning the transfer as soon as possible after.
-- */
--static bool
--try_fallback_GET_method (struct curl_handle *ch)
--{
--  CURLcode r;
--
--  nbdkit_debug ("attempting to fetch headers using GET method");
--
--  curl_easy_setopt (ch->c, CURLOPT_HTTPGET, 1L);
--  curl_easy_setopt (ch->c, CURLOPT_HEADERFUNCTION, header_cb);
--  curl_easy_setopt (ch->c, CURLOPT_HEADERDATA, ch);
--  curl_easy_setopt (ch->c, CURLOPT_WRITEFUNCTION, error_cb);
--  curl_easy_setopt (ch->c, CURLOPT_WRITEDATA, ch);
--  r = curl_easy_perform (ch->c);
--  update_times (ch->c);
--
--  /* We expect CURLE_WRITE_ERROR here, but CURLE_OK is possible too
--   * (eg if the remote has zero length).  Other errors might happen
--   * but we ignore them since it is a fallback path.
--   */
--  return r == CURLE_OK || r == CURLE_WRITE_ERROR;
--}
--
--static size_t
--header_cb (void *ptr, size_t size, size_t nmemb, void *opaque)
--{
--  struct curl_handle *ch = opaque;
--  size_t realsize = size * nmemb;
--  const char *header = ptr;
--  const char *end = header + realsize;
--  const char *accept_ranges = "accept-ranges:";
--  const char *bytes = "bytes";
--
--  if (realsize >= strlen (accept_ranges) &&
--      ascii_strncasecmp (header, accept_ranges, strlen (accept_ranges)) == 0) {
--    const char *p = strchr (header, ':') + 1;
--
--    /* Skip whitespace between the header name and value. */
--    while (p < end && *p && ascii_isspace (*p))
--      p++;
--
--    if (end - p >= strlen (bytes)
--        && strncmp (p, bytes, strlen (bytes)) == 0) {
--      /* Check that there is nothing but whitespace after the value. */
--      p += strlen (bytes);
--      while (p < end && *p && ascii_isspace (*p))
--        p++;
--
--      if (p == end || !*p)
--        ch->accept_range = true;
--    }
--  }
--
--  return realsize;
--}
--
--static size_t
--error_cb (char *ptr, size_t size, size_t nmemb, void *opaque)
--{
--#ifdef CURL_WRITEFUNC_ERROR
--  return CURL_WRITEFUNC_ERROR;
--#else
--  return 0; /* in older curl, any size < requested will also be an error */
--#endif
--}
--- 
-2.39.3
-
diff --git a/0015-curl-Make-times-seconds-field-slightly-wider.patch b/0015-curl-Make-times-seconds-field-slightly-wider.patch
deleted file mode 100644
index 595c9ca..0000000
--- a/0015-curl-Make-times-seconds-field-slightly-wider.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 110a96d728d54ff31d0d5ff1684427b45e91b832 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Fri, 28 Jul 2023 11:26:49 +0100
-Subject: [PATCH] curl: Make times seconds field slightly wider
-
-Updates: commit 68dddbeb584fb9385915846d259563f74338ffe8
-(cherry picked from commit 1622db8c9f6c6e42b679d1d81df019944178b373)
----
- plugins/curl/nbdkit-curl-plugin.pod | 14 +++++++-------
- plugins/curl/times.c                |  2 +-
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/plugins/curl/nbdkit-curl-plugin.pod b/plugins/curl/nbdkit-curl-plugin.pod
-index 0fd688ed..0774adad 100644
---- a/plugins/curl/nbdkit-curl-plugin.pod
-+++ b/plugins/curl/nbdkit-curl-plugin.pod
-@@ -551,13 +551,13 @@ information is printed in the debug output before nbdkit exits.  The
- output will look like:
- 
-  nbdkit: debug: times (-D curl.times=1):
-- nbdkit: debug: name resolution               :   0.128442 s
-- nbdkit: debug: connection                    :   4.945213 s
-- nbdkit: debug: SSL negotiation               :   4.291362 s
-- nbdkit: debug: pretransfer                   :   0.104137 s
-- nbdkit: debug: first byte received           :  56.115269 s
-- nbdkit: debug: data transfer                 : 222.633831 s
-- nbdkit: debug: redirection time              :   0.000000 s
-+ nbdkit: debug: name resolution               :    0.128442 s
-+ nbdkit: debug: connection                    :    4.945213 s
-+ nbdkit: debug: SSL negotiation               :    4.291362 s
-+ nbdkit: debug: pretransfer                   :    0.104137 s
-+ nbdkit: debug: first byte received           :   56.115269 s
-+ nbdkit: debug: data transfer                 :  222.633831 s
-+ nbdkit: debug: redirection time              :    0.000000 s
- 
- The cumulative time taken to perform each step is shown (summed across
- all HTTP connections).  The redirection time is the total time taken
-diff --git a/plugins/curl/times.c b/plugins/curl/times.c
-index 8cc4cf27..e752a0a9 100644
---- a/plugins/curl/times.c
-+++ b/plugins/curl/times.c
-@@ -123,7 +123,7 @@ display_times (void)
-       v = t;
-     prev_t = t;
- 
--    nbdkit_debug ("%-30s: %3" PRIi64 ".%06" PRIi64 " s",
-+    nbdkit_debug ("%-30s: %4" PRIi64 ".%06" PRIi64 " s",
-                   times[i].name,
-                   v / 1000000, v % 1000000);
-   }
--- 
-2.39.3
-
diff --git a/0016-curl-Use-_Atomic-type-to-accumulate-curl-timings.patch b/0016-curl-Use-_Atomic-type-to-accumulate-curl-timings.patch
deleted file mode 100644
index 81f9e5f..0000000
--- a/0016-curl-Use-_Atomic-type-to-accumulate-curl-timings.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 22590e0575e78c4fc754705b46d1458eeadefcf1 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Sun, 30 Jul 2023 16:45:38 +0100
-Subject: [PATCH] curl: Use _Atomic type to accumulate curl timings
-
-Because the global list of times is accessed in parallel by many
-threads, they must be accessed atomically.
-
-Fixes: commit 68dddbeb584fb9385915846d259563f74338ffe8
-(cherry picked from commit 4c527063336ccf14d286ef7db5766369e1b23845)
----
- plugins/curl/curldefs.h | 9 +++++++++
- plugins/curl/times.c    | 2 +-
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/curl/curldefs.h b/plugins/curl/curldefs.h
-index 9169b256..1feba844 100644
---- a/plugins/curl/curldefs.h
-+++ b/plugins/curl/curldefs.h
-@@ -35,6 +35,15 @@
- 
- #include <stdbool.h>
- 
-+#ifdef HAVE_STDATOMIC_H
-+#include <stdatomic.h>
-+#else
-+/* Some old platforms lack atomic types, but 32 bit ints are usually
-+ * "atomic enough".
-+ */
-+#define _Atomic /**/
-+#endif
-+
- #include "windows-compat.h"
- 
- /* Macro CURL_AT_LEAST_VERSION was added in 2015 (Curl 7.43) so if the
-diff --git a/plugins/curl/times.c b/plugins/curl/times.c
-index e752a0a9..23e2950b 100644
---- a/plugins/curl/times.c
-+++ b/plugins/curl/times.c
-@@ -54,7 +54,7 @@ static struct {
-   bool cumulative;
-   const char *name;
-   CURLINFO info;
--  curl_off_t t;
-+  _Atomic curl_off_t t;
- } times[] = {
- #ifdef HAVE_CURLINFO_NAMELOOKUP_TIME_T
-   { true, "name resolution", CURLINFO_NAMELOOKUP_TIME_T },
--- 
-2.39.3
-
diff --git a/0017-curl-Add-D-curl.verbose.ids-1-to-display-conn-and-xf.patch b/0017-curl-Add-D-curl.verbose.ids-1-to-display-conn-and-xf.patch
deleted file mode 100644
index 7add4a1..0000000
--- a/0017-curl-Add-D-curl.verbose.ids-1-to-display-conn-and-xf.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 07bdd644ae082c8e05afdcda4dcd12816ecc0efc Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Mon, 31 Jul 2023 13:24:39 +0100
-Subject: [PATCH] curl: Add -D curl.verbose.ids=1 to display conn and xfer IDs
-
-Enhance debugging output with connection (conn) and transfer (xfer)
-IDs.  Since there is some overhead to doing this, don't do it by
-default.  Also it requires libcurl >= 8.2.0.
-
-(cherry picked from commit a3ebf8f1c2cd5d399730ad6887b6b8bed94dc0ce)
----
- plugins/curl/config.c               | 37 +++++++++++++++++++++++++----
- plugins/curl/curldefs.h             |  4 ++++
- plugins/curl/nbdkit-curl-plugin.pod |  6 +++++
- 3 files changed, 43 insertions(+), 4 deletions(-)
-
-diff --git a/plugins/curl/config.c b/plugins/curl/config.c
-index 742d6080..d68c92ba 100644
---- a/plugins/curl/config.c
-+++ b/plugins/curl/config.c
-@@ -99,6 +99,9 @@ static size_t error_cb (char *ptr, size_t size, size_t nmemb, void *opaque);
- /* Use '-D curl.verbose=1' to set. */
- NBDKIT_DLL_PUBLIC int curl_debug_verbose = 0;
- 
-+/* Use '-D curl.verbose.ids=1' to set. */
-+NBDKIT_DLL_PUBLIC int curl_debug_verbose_ids = 0;
-+
- void
- unload_config (void)
- {
-@@ -707,6 +710,14 @@ debug_cb (CURL *handle, curl_infotype type,
- {
-   size_t origsize = size;
-   CLEANUP_FREE char *str;
-+  curl_off_t conn_id = -1, xfer_id = -1;
-+
-+#if defined(HAVE_CURLINFO_CONN_ID) && defined(HAVE_CURLINFO_XFER_ID)
-+  if (curl_debug_verbose_ids) {
-+    curl_easy_getinfo (handle, CURLINFO_CONN_ID, &conn_id);
-+    curl_easy_getinfo (handle, CURLINFO_XFER_ID, &xfer_id);
-+  }
-+#endif
- 
-   /* The data parameter passed is NOT \0-terminated, but also it may
-    * have \n or \r\n line endings.  The only sane way to deal with
-@@ -726,17 +737,35 @@ debug_cb (CURL *handle, curl_infotype type,
- 
-   switch (type) {
-   case CURLINFO_TEXT:
--    nbdkit_debug ("%s", str);
-+    if (conn_id >= 0 && xfer_id >= 0)
-+      nbdkit_debug ("conn %" PRIi64 " xfer %" PRIi64 ": %s",
-+                    conn_id, xfer_id, str);
-+    else
-+      nbdkit_debug ("%s",str);
-     break;
-   case CURLINFO_HEADER_IN:
--    nbdkit_debug ("S: %s", str);
-+    if (conn_id >= 0 && xfer_id >= 0)
-+      nbdkit_debug ("conn %" PRIi64 " xfer %" PRIi64 ": S: %s",
-+                    conn_id, xfer_id, str);
-+    else
-+      nbdkit_debug ("S: %s", str);
-     break;
-   case CURLINFO_HEADER_OUT:
--    nbdkit_debug ("C: %s", str);
-+    if (conn_id >= 0 && xfer_id >= 0)
-+      nbdkit_debug ("conn %" PRIi64 " xfer %" PRIi64 ": C: %s",
-+                    conn_id, xfer_id, str);
-+    else
-+      nbdkit_debug ("C: %s", str);
-     break;
-   default:
-     /* Assume everything else is binary data that we cannot print. */
--    nbdkit_debug ("<data with size=%zu>", origsize);
-+    if (conn_id >= 0 && xfer_id >= 0)
-+      nbdkit_debug ("conn %" PRIi64 " xfer %" PRIi64 ": "
-+                    "<data with size=%zu>",
-+                    conn_id, xfer_id,
-+                    origsize);
-+    else
-+      nbdkit_debug ("<data with size=%zu>", origsize);
-   }
- 
-  out:
-diff --git a/plugins/curl/curldefs.h b/plugins/curl/curldefs.h
-index 1feba844..022e8c60 100644
---- a/plugins/curl/curldefs.h
-+++ b/plugins/curl/curldefs.h
-@@ -62,6 +62,10 @@
- #define HAVE_CURLINFO_TOTAL_TIME_T
- #define HAVE_CURLINFO_REDIRECT_TIME_T
- #endif
-+#if CURL_AT_LEAST_VERSION (8, 2, 0)
-+#define HAVE_CURLINFO_CONN_ID
-+#define HAVE_CURLINFO_XFER_ID
-+#endif
- #endif
- 
- extern const char *url;
-diff --git a/plugins/curl/nbdkit-curl-plugin.pod b/plugins/curl/nbdkit-curl-plugin.pod
-index 0774adad..7784b553 100644
---- a/plugins/curl/nbdkit-curl-plugin.pod
-+++ b/plugins/curl/nbdkit-curl-plugin.pod
-@@ -570,6 +570,12 @@ This enables very verbose curl debugging.  See L<CURLOPT_VERBOSE(3)>.
- This is mainly useful if you suspect there is a bug inside libcurl
- itself.
- 
-+=item B<-D curl.verbose.ids=1>
-+
-+This enhances C<-D curl.verbose=1> by printing connection and transfer
-+IDs next to each debug message.  As this has some overhead it is not
-+enabled by default.
-+
- =back
- 
- =head1 FILES
--- 
-2.39.3
-
diff --git a/0018-curl-Rename-unload_config-unload_pool-config_unload-.patch b/0018-curl-Rename-unload_config-unload_pool-config_unload-.patch
deleted file mode 100644
index 1e497c3..0000000
--- a/0018-curl-Rename-unload_config-unload_pool-config_unload-.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From ae6c568fecbef8b2aa72a89d6afd4aabcec10a05 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Fri, 28 Jul 2023 14:24:04 +0100
-Subject: [PATCH] curl: Rename unload_config, unload_pool -> config_unload,
- pool_unload
-
-For consistency with scripts_unload.
-
-There is still a function called load_pool, but that inconsistency
-will be removed in a follow-on commit.
-
-Reviewed-by: Eric Blake <eblake@redhat.com>
-(cherry picked from commit f7bea74f670ba303c7ea60713cbbf301fab865fd)
----
- plugins/curl/config.c   | 2 +-
- plugins/curl/curl.c     | 4 ++--
- plugins/curl/curldefs.h | 4 ++--
- plugins/curl/pool.c     | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/plugins/curl/config.c b/plugins/curl/config.c
-index d68c92ba..276c79d5 100644
---- a/plugins/curl/config.c
-+++ b/plugins/curl/config.c
-@@ -103,7 +103,7 @@ NBDKIT_DLL_PUBLIC int curl_debug_verbose = 0;
- NBDKIT_DLL_PUBLIC int curl_debug_verbose_ids = 0;
- 
- void
--unload_config (void)
-+config_unload (void)
- {
-   free (cookie);
-   if (headers)
-diff --git a/plugins/curl/curl.c b/plugins/curl/curl.c
-index 99a7e00b..72971093 100644
---- a/plugins/curl/curl.c
-+++ b/plugins/curl/curl.c
-@@ -74,9 +74,9 @@ curl_load (void)
- static void
- curl_unload (void)
- {
--  unload_config ();
-+  config_unload ();
-   scripts_unload ();
--  unload_pool ();
-+  pool_unload ();
-   display_times ();
-   curl_global_cleanup ();
- }
-diff --git a/plugins/curl/curldefs.h b/plugins/curl/curldefs.h
-index 022e8c60..cab4a6b1 100644
---- a/plugins/curl/curldefs.h
-+++ b/plugins/curl/curldefs.h
-@@ -119,13 +119,13 @@ struct curl_handle {
- extern int curl_config (const char *key, const char *value);
- extern int curl_config_complete (void);
- extern const char *curl_config_help;
--extern void unload_config (void);
-+extern void config_unload (void);
- extern struct curl_handle *allocate_handle (void);
- extern void free_handle (struct curl_handle *);
- 
- /* pool.c */
- extern void load_pool (void);
--extern void unload_pool (void);
-+extern void pool_unload (void);
- extern struct curl_handle *get_handle (void);
- extern void put_handle (struct curl_handle *ch);
- 
-diff --git a/plugins/curl/pool.c b/plugins/curl/pool.c
-index 91e56f07..50a623a4 100644
---- a/plugins/curl/pool.c
-+++ b/plugins/curl/pool.c
-@@ -86,7 +86,7 @@ load_pool (void)
- 
- /* Close and free all handles in the pool. */
- void
--unload_pool (void)
-+pool_unload (void)
- {
-   size_t i;
- 
--- 
-2.39.3
-
diff --git a/0019-pool-Add-outline-get_ready-and-after_fork-functions.patch b/0019-pool-Add-outline-get_ready-and-after_fork-functions.patch
deleted file mode 100644
index 22a5fdb..0000000
--- a/0019-pool-Add-outline-get_ready-and-after_fork-functions.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 995b1b62add89b437cb51bb7e15a35c265e188b3 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Fri, 28 Jul 2023 14:33:03 +0100
-Subject: [PATCH] pool: Add outline get_ready and after_fork functions
-
-In a forthcoming commit we will need to create a multi handle and a
-background thread, requiring use of the .get_ready (for multi) and
-.after_fork (for the thread) plugin methods.  This commit removes the
-empty load_pool function and adds pool_get_ready and pool_after_fork,
-and the associated machinery in curl.c.
-
-This commit on its own does nothing, future commits will fill in these
-functions with useful work.
-
-Reviewed-by: Eric Blake <eblake@redhat.com>
-(cherry picked from commit 4075a499115a9e12ea74c4838fe00a7d680de2a1)
----
- plugins/curl/curl.c     | 14 +++++++++++++-
- plugins/curl/curldefs.h |  3 ++-
- plugins/curl/pool.c     | 12 +++++++++---
- 3 files changed, 24 insertions(+), 5 deletions(-)
-
-diff --git a/plugins/curl/curl.c b/plugins/curl/curl.c
-index 72971093..4e727b86 100644
---- a/plugins/curl/curl.c
-+++ b/plugins/curl/curl.c
-@@ -67,8 +67,18 @@ curl_load (void)
-     nbdkit_error ("libcurl initialization failed: %d", (int) r);
-     exit (EXIT_FAILURE);
-   }
-+}
- 
--  load_pool ();
-+int
-+curl_get_ready (void)
-+{
-+  return pool_get_ready ();
-+}
-+
-+int
-+curl_after_fork (void)
-+{
-+  return pool_after_fork ();
- }
- 
- static void
-@@ -249,6 +259,8 @@ static struct nbdkit_plugin plugin = {
-    */
-   //.config_help       = curl_config_help,
-   .magic_config_key  = "url",
-+  .get_ready         = curl_get_ready,
-+  .after_fork        = curl_after_fork,
-   .open              = curl_open,
-   .close             = curl_close,
-   .get_size          = curl_get_size,
-diff --git a/plugins/curl/curldefs.h b/plugins/curl/curldefs.h
-index cab4a6b1..939c8d37 100644
---- a/plugins/curl/curldefs.h
-+++ b/plugins/curl/curldefs.h
-@@ -124,7 +124,8 @@ extern struct curl_handle *allocate_handle (void);
- extern void free_handle (struct curl_handle *);
- 
- /* pool.c */
--extern void load_pool (void);
-+extern int pool_get_ready (void);
-+extern int pool_after_fork (void);
- extern void pool_unload (void);
- extern struct curl_handle *get_handle (void);
- extern void put_handle (struct curl_handle *ch);
-diff --git a/plugins/curl/pool.c b/plugins/curl/pool.c
-index 50a623a4..eb2d330e 100644
---- a/plugins/curl/pool.c
-+++ b/plugins/curl/pool.c
-@@ -78,10 +78,16 @@ static curl_handle_list curl_handles = empty_vector;
- static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
- static size_t in_use = 0, waiting = 0;
- 
--/* Initialize pool structures. */
--void
--load_pool (void)
-+int
-+pool_get_ready (void)
- {
-+  return 0;
-+}
-+
-+int
-+pool_after_fork (void)
-+{
-+  return 0;
- }
- 
- /* Close and free all handles in the pool. */
--- 
-2.39.3
-
diff --git a/0020-curl-Do-pool_unload-before-config_unload.patch b/0020-curl-Do-pool_unload-before-config_unload.patch
deleted file mode 100644
index 8fc6e18..0000000
--- a/0020-curl-Do-pool_unload-before-config_unload.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
-
diff --git a/0021-retry-request-Allow-get_size-operation-to-be-retried.patch b/0021-retry-request-Allow-get_size-operation-to-be-retried.patch
deleted file mode 100644
index 782f678..0000000
--- a/0021-retry-request-Allow-get_size-operation-to-be-retried.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0b9807056e8be58b624b67b281accddc630c5d2c Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Fri, 28 Jul 2023 16:47:58 +0100
-Subject: [PATCH] retry-request: Allow get_size operation to be retried
-
-This plugin operation might need to do some real work (instead of just
-fetching a number from memory), and so it might have to be retried.
-
-In particular, changes to the curl plugin make .get_size into a
-heavyweight operation, where previously it was done as a side-effect
-of .open.  And so we must allow .get_size to be retried independent of
-.open.
-
-(cherry picked from commit 0ff9f9e202218e278bf38faf328ec80f25d6b661)
----
- filters/retry-request/retry-request.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/filters/retry-request/retry-request.c b/filters/retry-request/retry-request.c
-index e5b8344c..8e3dd824 100644
---- a/filters/retry-request/retry-request.c
-+++ b/filters/retry-request/retry-request.c
-@@ -141,6 +141,18 @@ retry_request_open (nbdkit_next_open *next, nbdkit_context *nxdata,
-   return r == 0 ? NBDKIT_HANDLE_NOT_NEEDED : NULL;
- }
- 
-+static int64_t
-+retry_request_get_size (nbdkit_next *next, void *handle)
-+{
-+  int64_t r;
-+  int *err = &errno;          /* used by the RETRY_* macros */
-+
-+  RETRY_START("get_size")
-+    r = next->get_size (next);
-+  RETRY_END;
-+  return r;
-+}
-+
- static int
- retry_request_pread (nbdkit_next *next,
-                      void *handle, void *buf, uint32_t count, uint64_t offset,
-@@ -267,6 +279,7 @@ static struct nbdkit_filter filter = {
-   .config            = retry_request_config,
-   .config_help       = retry_request_config_help,
-   .open              = retry_request_open,
-+  .get_size          = retry_request_get_size,
-   .pread             = retry_request_pread,
-   .pwrite            = retry_request_pwrite,
-   .trim              = retry_request_trim,
--- 
-2.39.3
-
diff --git a/0022-tests-test-retry-request-mirror.c-Don-t-assume-state.patch b/0022-tests-test-retry-request-mirror.c-Don-t-assume-state.patch
deleted file mode 100644
index db9449f..0000000
--- a/0022-tests-test-retry-request-mirror.c-Don-t-assume-state.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 85241affaa52e4d67d0a22329d4cc5e2b0fe5ca3 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Fri, 28 Jul 2023 16:59:20 +0100
-Subject: [PATCH] tests/test-retry-request-mirror.c: Don't assume state after
- connect
-
-After forthcoming changes to the curl plugin we cannot assume the
-exact mirror we will be connected to after making the NBD connection.
-So remove that assumption.
-
-See: commit 38dccd848bd40cccdf012df7a606e13282aaeecb
-Reviewed-by: Eric Blake <eblake@redhat.com>
-(cherry picked from commit ee03fbd2385dcd8772ad2c838401df0b5d8c5617)
----
- tests/test-retry-request-mirror.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test-retry-request-mirror.c b/tests/test-retry-request-mirror.c
-index cf42c596..65440d2e 100644
---- a/tests/test-retry-request-mirror.c
-+++ b/tests/test-retry-request-mirror.c
-@@ -58,7 +58,7 @@ main (int argc, char *argv[])
-   const char *sockpath;
-   CLEANUP_FREE char *usp_param = NULL;
-   int i, j;
--  char state = 0;
-+  char state;
-   struct nbd_handle *nbd = NULL;
- 
- #ifndef HAVE_CURLOPT_UNIX_SOCKET_PATH
-@@ -105,6 +105,8 @@ main (int argc, char *argv[])
-     if (nbd_connect_unix (nbd, sock /* NBD socket */) == -1)
-       goto nbd_error;
- 
-+    state = 0;
-+
-     for (i = 0; i < 7 /* not divisible by 2 or 3 */; ++i) {
-       char buf[512];
- 
--- 
-2.39.3
-
diff --git a/0023-curl-Use-curl-multi-interface.patch b/0023-curl-Use-curl-multi-interface.patch
deleted file mode 100644
index fe387f1..0000000
--- a/0023-curl-Use-curl-multi-interface.patch
+++ /dev/null
@@ -1,1279 +0,0 @@
-From d0e4238471c7bcb0757a877622fea593e8906fcc Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 27 Jul 2023 17:08:25 +0100
-Subject: [PATCH] curl: Use curl multi interface
-
-See the comment at the top of plugins/curl/pool.c for general
-information about how this works.
-
-This makes a very large difference to performance over the previous
-implementation.  Note for the tests below I also applied the next
-commit changing the behaviour of the connections parameter.
-
-Using this test case:
-
-  $ http=https://cloud-images.ubuntu.com/lunar/current/lunar-server-cloudimg-amd64.img
-  $ nbdkit -r -U - curl $http ipresolve=v4 --run 'nbdcopy -p $uri null'
-
-The times are as follows:
-
-  multi, connections=64           17.2s
-  multi, connections=32           21.7s
-  wget                            28.4s
-  multi, connections=16           41.3s
-  before this commit             180s
-
-(cherry picked from commit a74b289ee15a7c75dceb8a96403f1fa8ebd72e88)
----
- plugins/curl/config.c   | 246 --------------------------
- plugins/curl/curl.c     | 366 +++++++++++++++++++++++++++++++++-----
- plugins/curl/curldefs.h |  38 ++--
- plugins/curl/pool.c     | 381 ++++++++++++++++++++++++++++++++--------
- 4 files changed, 652 insertions(+), 379 deletions(-)
-
-diff --git a/plugins/curl/config.c b/plugins/curl/config.c
-index 276c79d5..ce82d5f9 100644
---- a/plugins/curl/config.c
-+++ b/plugins/curl/config.c
-@@ -48,8 +48,6 @@
- 
- #include <nbdkit-plugin.h>
- 
--#include "ascii-ctype.h"
--#include "ascii-string.h"
- #include "cleanup.h"
- 
- #include "curldefs.h"
-@@ -89,12 +87,6 @@ static const char *user_agent = NULL;
- 
- static int debug_cb (CURL *handle, curl_infotype type,
-                      const char *data, size_t size, void *);
--static size_t write_cb (char *ptr, size_t size, size_t nmemb, void *opaque);
--static size_t read_cb (void *ptr, size_t size, size_t nmemb, void *opaque);
--static int get_content_length_accept_range (struct curl_handle *ch);
--static bool try_fallback_GET_method (struct curl_handle *ch);
--static size_t header_cb (void *ptr, size_t size, size_t nmemb, void *opaque);
--static size_t error_cb (char *ptr, size_t size, size_t nmemb, void *opaque);
- 
- /* Use '-D curl.verbose=1' to set. */
- NBDKIT_DLL_PUBLIC int curl_debug_verbose = 0;
-@@ -671,17 +663,9 @@ allocate_handle (void)
-   if (user_agent)
-     curl_easy_setopt (ch->c, CURLOPT_USERAGENT, user_agent);
- 
--  if (get_content_length_accept_range (ch) == -1)
--    goto err;
--
-   /* Get set up for reading and writing. */
-   curl_easy_setopt (ch->c, CURLOPT_HEADERFUNCTION, NULL);
-   curl_easy_setopt (ch->c, CURLOPT_HEADERDATA, NULL);
--  curl_easy_setopt (ch->c, CURLOPT_WRITEFUNCTION, write_cb);
--  curl_easy_setopt (ch->c, CURLOPT_WRITEDATA, ch);
--  /* These are only used if !readonly but we always register them. */
--  curl_easy_setopt (ch->c, CURLOPT_READFUNCTION, read_cb);
--  curl_easy_setopt (ch->c, CURLOPT_READDATA, ch);
- 
-   return ch;
- 
-@@ -771,233 +755,3 @@ debug_cb (CURL *handle, curl_infotype type,
-  out:
-   return 0;
- }
--
--/* NB: The terminology used by libcurl is confusing!
-- *
-- * WRITEFUNCTION / write_cb is used when reading from the remote server
-- * READFUNCTION / read_cb is used when writing to the remote server.
-- *
-- * We use the same terminology as libcurl here.
-- */
--
--static size_t
--write_cb (char *ptr, size_t size, size_t nmemb, void *opaque)
--{
--  struct curl_handle *ch = opaque;
--  size_t orig_realsize = size * nmemb;
--  size_t realsize = orig_realsize;
--
--  assert (ch->write_buf);
--
--  /* Don't read more than the requested amount of data, even if the
--   * server or libcurl sends more.
--   */
--  if (realsize > ch->write_count)
--    realsize = ch->write_count;
--
--  memcpy (ch->write_buf, ptr, realsize);
--
--  ch->write_count -= realsize;
--  ch->write_buf += realsize;
--
--  return orig_realsize;
--}
--
--static size_t
--read_cb (void *ptr, size_t size, size_t nmemb, void *opaque)
--{
--  struct curl_handle *ch = opaque;
--  size_t realsize = size * nmemb;
--
--  assert (ch->read_buf);
--  if (realsize > ch->read_count)
--    realsize = ch->read_count;
--
--  memcpy (ptr, ch->read_buf, realsize);
--
--  ch->read_count -= realsize;
--  ch->read_buf += realsize;
--
--  return realsize;
--}
--
--/* Get the file size and also whether the remote HTTP server
-- * supports byte ranges.
-- */
--static int
--get_content_length_accept_range (struct curl_handle *ch)
--{
--  CURLcode r;
--  long code;
--#ifdef HAVE_CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
--  curl_off_t o;
--#else
--  double d;
--#endif
--
--  /* We must run the scripts if necessary and set headers in the
--   * handle.
--   */
--  if (do_scripts (ch) == -1)
--    return -1;
--
--  /* Set this flag in the handle to false.  The callback should set it
--   * to true if byte ranges are supported, which we check below.
--   */
--  ch->accept_range = false;
--
--  /* No Body, not nobody!  This forces a HEAD request. */
--  curl_easy_setopt (ch->c, CURLOPT_NOBODY, 1L);
--  curl_easy_setopt (ch->c, CURLOPT_HEADERFUNCTION, header_cb);
--  curl_easy_setopt (ch->c, CURLOPT_HEADERDATA, ch);
--  r = curl_easy_perform (ch->c);
--  update_times (ch->c);
--  if (r != CURLE_OK) {
--    display_curl_error (ch, r,
--                        "problem doing HEAD request to fetch size of URL [%s]",
--                        url);
--
--    /* Get the HTTP status code, if available. */
--    r = curl_easy_getinfo (ch->c, CURLINFO_RESPONSE_CODE, &code);
--    if (r == CURLE_OK)
--      nbdkit_debug ("HTTP status code: %ld", code);
--    else
--      code = -1;
--
--    /* See comment on try_fallback_GET_method below. */
--    if (code != 403 || !try_fallback_GET_method (ch))
--      return -1;
--  }
--
--  /* Get the content length.
--   *
--   * Note there is some subtlety here: For web servers using chunked
--   * encoding, either the Content-Length header will not be present,
--   * or if present it should be ignored.  (For such servers the only
--   * way to find out the true length would be to read all of the
--   * content, which we don't want to do).
--   *
--   * Curl itself resolves this for us.  It will ignore the
--   * Content-Length header if chunked encoding is used, returning the
--   * length as -1 which we check below (see also
--   * curl:lib/http.c:Curl_http_size).
--   */
--#ifdef HAVE_CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
--  r = curl_easy_getinfo (ch->c, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &o);
--  if (r != CURLE_OK) {
--    display_curl_error (ch, r,
--                        "could not get length of remote file [%s]", url);
--    return -1;
--  }
--
--  if (o == -1) {
--    nbdkit_error ("could not get length of remote file [%s], "
--                  "is the URL correct?", url);
--    return -1;
--  }
--
--  ch->exportsize = o;
--#else
--  r = curl_easy_getinfo (ch->c, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &d);
--  if (r != CURLE_OK) {
--    display_curl_error (ch, r,
--                        "could not get length of remote file [%s]", url);
--    return -1;
--  }
--
--  if (d == -1) {
--    nbdkit_error ("could not get length of remote file [%s], "
--                  "is the URL correct?", url);
--    return -1;
--  }
--
--  ch->exportsize = d;
--#endif
--  nbdkit_debug ("content length: %" PRIi64, ch->exportsize);
--
--  /* If this is HTTP, check that byte ranges are supported. */
--  if (ascii_strncasecmp (url, "http://", strlen ("http://")) == 0 ||
--      ascii_strncasecmp (url, "https://", strlen ("https://")) == 0) {
--    if (!ch->accept_range) {
--      nbdkit_error ("server does not support 'range' (byte range) requests");
--      return -1;
--    }
--
--    nbdkit_debug ("accept range supported (for HTTP/HTTPS)");
--  }
--
--  return 0;
--}
--
--/* S3 servers can return 403 Forbidden for HEAD but still respond
-- * to GET, so we give it a second chance in that case.
-- * https://github.com/kubevirt/containerized-data-importer/issues/2737
-- *
-- * This function issues a GET request with a writefunction that always
-- * returns an error, thus effectively getting the headers but
-- * abandoning the transfer as soon as possible after.
-- */
--static bool
--try_fallback_GET_method (struct curl_handle *ch)
--{
--  CURLcode r;
--
--  nbdkit_debug ("attempting to fetch headers using GET method");
--
--  curl_easy_setopt (ch->c, CURLOPT_HTTPGET, 1L);
--  curl_easy_setopt (ch->c, CURLOPT_HEADERFUNCTION, header_cb);
--  curl_easy_setopt (ch->c, CURLOPT_HEADERDATA, ch);
--  curl_easy_setopt (ch->c, CURLOPT_WRITEFUNCTION, error_cb);
--  curl_easy_setopt (ch->c, CURLOPT_WRITEDATA, ch);
--  r = curl_easy_perform (ch->c);
--  update_times (ch->c);
--
--  /* We expect CURLE_WRITE_ERROR here, but CURLE_OK is possible too
--   * (eg if the remote has zero length).  Other errors might happen
--   * but we ignore them since it is a fallback path.
--   */
--  return r == CURLE_OK || r == CURLE_WRITE_ERROR;
--}
--
--static size_t
--header_cb (void *ptr, size_t size, size_t nmemb, void *opaque)
--{
--  struct curl_handle *ch = opaque;
--  size_t realsize = size * nmemb;
--  const char *header = ptr;
--  const char *end = header + realsize;
--  const char *accept_ranges = "accept-ranges:";
--  const char *bytes = "bytes";
--
--  if (realsize >= strlen (accept_ranges) &&
--      ascii_strncasecmp (header, accept_ranges, strlen (accept_ranges)) == 0) {
--    const char *p = strchr (header, ':') + 1;
--
--    /* Skip whitespace between the header name and value. */
--    while (p < end && *p && ascii_isspace (*p))
--      p++;
--
--    if (end - p >= strlen (bytes)
--        && strncmp (p, bytes, strlen (bytes)) == 0) {
--      /* Check that there is nothing but whitespace after the value. */
--      p += strlen (bytes);
--      while (p < end && *p && ascii_isspace (*p))
--        p++;
--
--      if (p == end || !*p)
--        ch->accept_range = true;
--    }
--  }
--
--  return realsize;
--}
--
--static size_t
--error_cb (char *ptr, size_t size, size_t nmemb, void *opaque)
--{
--#ifdef CURL_WRITEFUNC_ERROR
--  return CURL_WRITEFUNC_ERROR;
--#else
--  return 0; /* in older curl, any size < requested will also be an error */
--#endif
--}
-diff --git a/plugins/curl/curl.c b/plugins/curl/curl.c
-index be42de36..28cc7bbe 100644
---- a/plugins/curl/curl.c
-+++ b/plugins/curl/curl.c
-@@ -48,7 +48,8 @@
- 
- #include <nbdkit-plugin.h>
- 
--#include "cleanup.h"
-+#include "ascii-ctype.h"
-+#include "ascii-string.h"
- 
- #include "curldefs.h"
- 
-@@ -118,32 +119,6 @@ curl_close (void *handle)
- 
- #define THREAD_MODEL NBDKIT_THREAD_MODEL_PARALLEL
- 
--/* Calls get_handle() ... put_handle() to get a handle for the length
-- * of the current scope.
-- */
--#define GET_HANDLE_FOR_CURRENT_SCOPE(ch) \
--  CLEANUP_PUT_HANDLE struct curl_handle *ch = get_handle ();
--#define CLEANUP_PUT_HANDLE __attribute__ ((cleanup (cleanup_put_handle)))
--static void
--cleanup_put_handle (void *chp)
--{
--  struct curl_handle *ch = * (struct curl_handle **) chp;
--
--  if (ch != NULL)
--    put_handle (ch);
--}
--
--/* Get the file size. */
--static int64_t
--curl_get_size (void *handle)
--{
--  GET_HANDLE_FOR_CURRENT_SCOPE (ch);
--  if (ch == NULL)
--    return -1;
--
--  return ch->exportsize;
--}
--
- /* Multi-conn is safe for read-only connections, but HTTP does not
-  * have any concept of flushing so we cannot use it for read-write
-  * connections.
-@@ -156,23 +131,253 @@ curl_can_multi_conn (void *handle)
-   return !! h->readonly;
- }
- 
-+/* Get the file size. */
-+static int get_content_length_accept_range (struct curl_handle *ch);
-+static bool try_fallback_GET_method (struct curl_handle *ch);
-+static size_t header_cb (void *ptr, size_t size, size_t nmemb, void *opaque);
-+static size_t error_cb (char *ptr, size_t size, size_t nmemb, void *opaque);
-+
-+static int64_t
-+curl_get_size (void *handle)
-+{
-+  struct curl_handle *ch;
-+  CURLcode r;
-+  long code;
-+#ifdef HAVE_CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
-+  curl_off_t o;
-+#else
-+  double d;
-+#endif
-+  int64_t exportsize;
-+
-+  /* Get a curl easy handle. */
-+  ch = allocate_handle ();
-+  if (ch == NULL) goto err;
-+
-+  /* Prepare to read the headers. */
-+  if (get_content_length_accept_range (ch) == -1)
-+    goto err;
-+
-+  /* Send the command to the worker thread and wait. */
-+  struct command cmd = {
-+    .type = EASY_HANDLE,
-+    .ch = ch,
-+  };
-+
-+  r = send_command_and_wait (&cmd);
-+  update_times (ch->c);
-+  if (r != CURLE_OK) {
-+    display_curl_error (ch, r,
-+                        "problem doing HEAD request to fetch size of URL [%s]",
-+                        url);
-+
-+    /* Get the HTTP status code, if available. */
-+    r = curl_easy_getinfo (ch->c, CURLINFO_RESPONSE_CODE, &code);
-+    if (r == CURLE_OK)
-+      nbdkit_debug ("HTTP status code: %ld", code);
-+    else
-+      code = -1;
-+
-+    /* See comment on try_fallback_GET_method below. */
-+    if (code != 403 || !try_fallback_GET_method (ch))
-+      goto err;
-+  }
-+
-+  /* Get the content length.
-+   *
-+   * Note there is some subtlety here: For web servers using chunked
-+   * encoding, either the Content-Length header will not be present,
-+   * or if present it should be ignored.  (For such servers the only
-+   * way to find out the true length would be to read all of the
-+   * content, which we don't want to do).
-+   *
-+   * Curl itself resolves this for us.  It will ignore the
-+   * Content-Length header if chunked encoding is used, returning the
-+   * length as -1 which we check below (see also
-+   * curl:lib/http.c:Curl_http_size).
-+   */
-+#ifdef HAVE_CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
-+  r = curl_easy_getinfo (ch->c, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &o);
-+  if (r != CURLE_OK) {
-+    display_curl_error (ch, r,
-+                        "could not get length of remote file [%s]", url);
-+    goto err;
-+  }
-+
-+  if (o == -1) {
-+    nbdkit_error ("could not get length of remote file [%s], "
-+                  "is the URL correct?", url);
-+    goto err;
-+  }
-+
-+  exportsize = o;
-+#else
-+  r = curl_easy_getinfo (ch->c, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &d);
-+  if (r != CURLE_OK) {
-+    display_curl_error (ch, r,
-+                        "could not get length of remote file [%s]", url);
-+    goto err;
-+  }
-+
-+  if (d == -1) {
-+    nbdkit_error ("could not get length of remote file [%s], "
-+                  "is the URL correct?", url);
-+    goto err;
-+  }
-+
-+  exportsize = d;
-+#endif
-+  nbdkit_debug ("content length: %" PRIi64, exportsize);
-+
-+  /* If this is HTTP, check that byte ranges are supported. */
-+  if (ascii_strncasecmp (url, "http://", strlen ("http://")) == 0 ||
-+      ascii_strncasecmp (url, "https://", strlen ("https://")) == 0) {
-+    if (!ch->accept_range) {
-+      nbdkit_error ("server does not support 'range' (byte range) requests");
-+      goto err;
-+    }
-+
-+    nbdkit_debug ("accept range supported (for HTTP/HTTPS)");
-+  }
-+
-+  free_handle (ch);
-+  return exportsize;
-+
-+ err:
-+  if (ch)
-+    free_handle (ch);
-+  return -1;
-+}
-+
-+/* Get the file size and also whether the remote HTTP server
-+ * supports byte ranges.
-+ */
-+static int
-+get_content_length_accept_range (struct curl_handle *ch)
-+{
-+  /* We must run the scripts if necessary and set headers in the
-+   * handle.
-+   */
-+  if (do_scripts (ch) == -1)
-+    return -1;
-+
-+  /* Set this flag in the handle to false.  The callback should set it
-+   * to true if byte ranges are supported, which we check below.
-+   */
-+  ch->accept_range = false;
-+
-+  /* No Body, not nobody!  This forces a HEAD request. */
-+  curl_easy_setopt (ch->c, CURLOPT_NOBODY, 1L);
-+  curl_easy_setopt (ch->c, CURLOPT_HEADERFUNCTION, header_cb);
-+  curl_easy_setopt (ch->c, CURLOPT_HEADERDATA, ch);
-+  curl_easy_setopt (ch->c, CURLOPT_WRITEFUNCTION, NULL);
-+  curl_easy_setopt (ch->c, CURLOPT_WRITEDATA, NULL);
-+  curl_easy_setopt (ch->c, CURLOPT_READFUNCTION, NULL);
-+  curl_easy_setopt (ch->c, CURLOPT_READDATA, NULL);
-+  return 0;
-+}
-+
-+/* S3 servers can return 403 Forbidden for HEAD but still respond
-+ * to GET, so we give it a second chance in that case.
-+ * https://github.com/kubevirt/containerized-data-importer/issues/2737
-+ *
-+ * This function issues a GET request with a writefunction that always
-+ * returns an error, thus effectively getting the headers but
-+ * abandoning the transfer as soon as possible after.
-+ */
-+static bool
-+try_fallback_GET_method (struct curl_handle *ch)
-+{
-+  CURLcode r;
-+
-+  nbdkit_debug ("attempting to fetch headers using GET method");
-+
-+  curl_easy_setopt (ch->c, CURLOPT_HTTPGET, 1L);
-+  curl_easy_setopt (ch->c, CURLOPT_HEADERFUNCTION, header_cb);
-+  curl_easy_setopt (ch->c, CURLOPT_HEADERDATA, ch);
-+  curl_easy_setopt (ch->c, CURLOPT_WRITEFUNCTION, error_cb);
-+  curl_easy_setopt (ch->c, CURLOPT_WRITEDATA, ch);
-+
-+  struct command cmd = {
-+    .type = EASY_HANDLE,
-+    .ch = ch,
-+  };
-+
-+  r = send_command_and_wait (&cmd);
-+  update_times (ch->c);
-+
-+  /* We expect CURLE_WRITE_ERROR here, but CURLE_OK is possible too
-+   * (eg if the remote has zero length).  Other errors might happen
-+   * but we ignore them since it is a fallback path.
-+   */
-+  return r == CURLE_OK || r == CURLE_WRITE_ERROR;
-+}
-+
-+static size_t
-+header_cb (void *ptr, size_t size, size_t nmemb, void *opaque)
-+{
-+  struct curl_handle *ch = opaque;
-+  size_t realsize = size * nmemb;
-+  const char *header = ptr;
-+  const char *end = header + realsize;
-+  const char *accept_ranges = "accept-ranges:";
-+  const char *bytes = "bytes";
-+
-+  if (realsize >= strlen (accept_ranges) &&
-+      ascii_strncasecmp (header, accept_ranges, strlen (accept_ranges)) == 0) {
-+    const char *p = strchr (header, ':') + 1;
-+
-+    /* Skip whitespace between the header name and value. */
-+    while (p < end && *p && ascii_isspace (*p))
-+      p++;
-+
-+    if (end - p >= strlen (bytes)
-+        && strncmp (p, bytes, strlen (bytes)) == 0) {
-+      /* Check that there is nothing but whitespace after the value. */
-+      p += strlen (bytes);
-+      while (p < end && *p && ascii_isspace (*p))
-+        p++;
-+
-+      if (p == end || !*p)
-+        ch->accept_range = true;
-+    }
-+  }
-+
-+  return realsize;
-+}
-+
-+static size_t
-+error_cb (char *ptr, size_t size, size_t nmemb, void *opaque)
-+{
-+#ifdef CURL_WRITEFUNC_ERROR
-+  return CURL_WRITEFUNC_ERROR;
-+#else
-+  return 0; /* in older curl, any size < requested will also be an error */
-+#endif
-+}
-+
- /* Read data from the remote server. */
-+static size_t write_cb (char *ptr, size_t size, size_t nmemb, void *opaque);
-+
- static int
- curl_pread (void *handle, void *buf, uint32_t count, uint64_t offset)
- {
-   CURLcode r;
-+  struct curl_handle *ch;
-   char range[128];
- 
--  GET_HANDLE_FOR_CURRENT_SCOPE (ch);
--  if (ch == NULL)
--    return -1;
-+  /* Get a curl easy handle. */
-+  ch = allocate_handle ();
-+  if (ch == NULL) goto err;
- 
-   /* Run the scripts if necessary and set headers in the handle. */
--  if (do_scripts (ch) == -1) return -1;
-+  if (do_scripts (ch) == -1) goto err;
- 
-   /* Tell the write_cb where we want the data to be written.  write_cb
-    * will update this if the data comes in multiple sections.
-    */
-+  curl_easy_setopt (ch->c, CURLOPT_WRITEFUNCTION, write_cb);
-+  curl_easy_setopt (ch->c, CURLOPT_WRITEDATA, ch);
-   ch->write_buf = buf;
-   ch->write_count = count;
- 
-@@ -183,11 +388,16 @@ curl_pread (void *handle, void *buf, uint32_t count, uint64_t offset)
-             offset, offset + count);
-   curl_easy_setopt (ch->c, CURLOPT_RANGE, range);
- 
--  /* The assumption here is that curl will look after timeouts. */
--  r = curl_easy_perform (ch->c);
-+  /* Send the command to the worker thread and wait. */
-+  struct command cmd = {
-+    .type = EASY_HANDLE,
-+    .ch = ch,
-+  };
-+
-+  r = send_command_and_wait (&cmd);
-   if (r != CURLE_OK) {
--    display_curl_error (ch, r, "pread: curl_easy_perform");
--    return -1;
-+    display_curl_error (ch, r, "pread");
-+    goto err;
-   }
-   update_times (ch->c);
- 
-@@ -198,26 +408,67 @@ curl_pread (void *handle, void *buf, uint32_t count, uint64_t offset)
-   /* As far as I understand the cURL API, this should never happen. */
-   assert (ch->write_count == 0);
- 
-+  free_handle (ch);
-   return 0;
-+
-+ err:
-+  if (ch)
-+    free_handle (ch);
-+  return -1;
-+}
-+
-+/* NB: The terminology used by libcurl is confusing!
-+ *
-+ * WRITEFUNCTION / write_cb is used when reading from the remote server
-+ * READFUNCTION / read_cb is used when writing to the remote server.
-+ *
-+ * We use the same terminology as libcurl here.
-+ */
-+static size_t
-+write_cb (char *ptr, size_t size, size_t nmemb, void *opaque)
-+{
-+  struct curl_handle *ch = opaque;
-+  size_t orig_realsize = size * nmemb;
-+  size_t realsize = orig_realsize;
-+
-+  assert (ch->write_buf);
-+
-+  /* Don't read more than the requested amount of data, even if the
-+   * server or libcurl sends more.
-+   */
-+  if (realsize > ch->write_count)
-+    realsize = ch->write_count;
-+
-+  memcpy (ch->write_buf, ptr, realsize);
-+
-+  ch->write_count -= realsize;
-+  ch->write_buf += realsize;
-+
-+  return orig_realsize;
- }
- 
- /* Write data to the remote server. */
-+static size_t read_cb (void *ptr, size_t size, size_t nmemb, void *opaque);
-+
- static int
- curl_pwrite (void *handle, const void *buf, uint32_t count, uint64_t offset)
- {
-   CURLcode r;
-+  struct curl_handle *ch;
-   char range[128];
- 
--  GET_HANDLE_FOR_CURRENT_SCOPE (ch);
--  if (ch == NULL)
--    return -1;
-+  /* Get a curl easy handle. */
-+  ch = allocate_handle ();
-+  if (ch == NULL) goto err;
- 
-   /* Run the scripts if necessary and set headers in the handle. */
--  if (do_scripts (ch) == -1) return -1;
-+  if (do_scripts (ch) == -1) goto err;
- 
-   /* Tell the read_cb where we want the data to be read from.  read_cb
-    * will update this if the data comes in multiple sections.
-    */
-+  curl_easy_setopt (ch->c, CURLOPT_READFUNCTION, read_cb);
-+  curl_easy_setopt (ch->c, CURLOPT_READDATA, ch);
-   ch->read_buf = buf;
-   ch->read_count = count;
- 
-@@ -228,11 +479,16 @@ curl_pwrite (void *handle, const void *buf, uint32_t count, uint64_t offset)
-             offset, offset + count);
-   curl_easy_setopt (ch->c, CURLOPT_RANGE, range);
- 
--  /* The assumption here is that curl will look after timeouts. */
--  r = curl_easy_perform (ch->c);
-+  /* Send the command to the worker thread and wait. */
-+  struct command cmd = {
-+    .type = EASY_HANDLE,
-+    .ch = ch,
-+  };
-+
-+  r = send_command_and_wait (&cmd);
-   if (r != CURLE_OK) {
--    display_curl_error (ch, r, "pwrite: curl_easy_perform");
--    return -1;
-+    display_curl_error (ch, r, "pwrite");
-+    goto err;
-   }
-   update_times (ch->c);
- 
-@@ -243,7 +499,31 @@ curl_pwrite (void *handle, const void *buf, uint32_t count, uint64_t offset)
-   /* As far as I understand the cURL API, this should never happen. */
-   assert (ch->read_count == 0);
- 
-+  free_handle (ch);
-   return 0;
-+
-+ err:
-+  if (ch)
-+    free_handle (ch);
-+  return -1;
-+}
-+
-+static size_t
-+read_cb (void *ptr, size_t size, size_t nmemb, void *opaque)
-+{
-+  struct curl_handle *ch = opaque;
-+  size_t realsize = size * nmemb;
-+
-+  assert (ch->read_buf);
-+  if (realsize > ch->read_count)
-+    realsize = ch->read_count;
-+
-+  memcpy (ptr, ch->read_buf, realsize);
-+
-+  ch->read_count -= realsize;
-+  ch->read_buf += realsize;
-+
-+  return realsize;
- }
- 
- static struct nbdkit_plugin plugin = {
-diff --git a/plugins/curl/curldefs.h b/plugins/curl/curldefs.h
-index 939c8d37..6b158d85 100644
---- a/plugins/curl/curldefs.h
-+++ b/plugins/curl/curldefs.h
-@@ -62,6 +62,9 @@
- #define HAVE_CURLINFO_TOTAL_TIME_T
- #define HAVE_CURLINFO_REDIRECT_TIME_T
- #endif
-+#if CURL_AT_LEAST_VERSION (7, 66, 0)
-+#define HAVE_CURL_MULTI_POLL
-+#endif
- #if CURL_AT_LEAST_VERSION (8, 2, 0)
- #define HAVE_CURLINFO_CONN_ID
- #define HAVE_CURLINFO_XFER_ID
-@@ -89,16 +92,6 @@ struct curl_handle {
-   /* The underlying curl handle. */
-   CURL *c;
- 
--  /* Index of this handle in the pool (for debugging). */
--  size_t i;
--
--  /* True if the handle is in use by a thread. */
--  bool in_use;
--
--  /* These fields are used/initialized when we create the handle. */
--  bool accept_range;
--  int64_t exportsize;
--
-   char errbuf[CURL_ERROR_SIZE];
- 
-   /* Before doing a read or write operation, set these to point to the
-@@ -111,8 +104,30 @@ struct curl_handle {
-   const char *read_buf;
-   uint32_t read_count;
- 
-+  /* This field is used by curl_get_size. */
-+  bool accept_range;
-+
-   /* Used by scripts.c */
-   struct curl_slist *headers_copy;
-+
-+  /* Used by pool.c */
-+  struct command *cmd;
-+};
-+
-+/* Asynchronous commands that can be sent to the pool thread. */
-+enum command_type { EASY_HANDLE, STOP };
-+struct command {
-+  /* These fields are set by the caller. */
-+  enum command_type type;       /* command */
-+  struct curl_handle *ch;       /* for EASY_HANDLE, the easy handle */
-+
-+  /* This field is set to a unique value by send_command_and_wait. */
-+  uint64_t id;                  /* serial number */
-+
-+  /* These fields are used to signal back that the command finished. */
-+  pthread_mutex_t mutex;        /* completion mutex */
-+  pthread_cond_t cond;          /* completion condition */
-+  CURLcode status;              /* status code (CURLE_OK = succeeded) */
- };
- 
- /* config.c */
-@@ -127,8 +142,7 @@ extern void free_handle (struct curl_handle *);
- extern int pool_get_ready (void);
- extern int pool_after_fork (void);
- extern void pool_unload (void);
--extern struct curl_handle *get_handle (void);
--extern void put_handle (struct curl_handle *ch);
-+extern CURLcode send_command_and_wait (struct command *cmd);
- 
- /* scripts.c */
- extern int do_scripts (struct curl_handle *ch);
-diff --git a/plugins/curl/pool.c b/plugins/curl/pool.c
-index eb2d330e..254951d1 100644
---- a/plugins/curl/pool.c
-+++ b/plugins/curl/pool.c
-@@ -30,11 +30,29 @@
-  * SUCH DAMAGE.
-  */
- 
--/* Curl handle pool.
-+/* Worker thread which processes the curl multi interface.
-  *
-- * To get a libcurl handle, call get_handle().  When you hold the
-- * handle, it is yours exclusively to use.  After you have finished
-- * with the handle, put it back into the pool by calling put_handle().
-+ * The main nbdkit threads (see curl.c) create curl easy handles
-+ * initialized with the work they want to carry out.  Note there is
-+ * one easy handle per task (eg. per pread/pwrite request).  The easy
-+ * handles are not reused.
-+ *
-+ * The commands + optional easy handle are submitted to the worker
-+ * thread over a self-pipe (it's easy to use a pipe here because the
-+ * way curl multi works is it can listen on an extra fd, but not on
-+ * anything else like a pthread condition).  The curl multi performs
-+ * the work of the outstanding easy handles.
-+ *
-+ * When an easy handle finishes work or errors, we retire the command
-+ * by signalling back to the waiting nbdkit thread using a pthread
-+ * condition.
-+ *
-+ * In my experiments, we're almost always I/O bound so I haven't seen
-+ * any strong need to use more than one curl multi / worker thread,
-+ * although it would be possible to add more in future.
-+ *
-+ * See also this extremely useful thread:
-+ * https://curl.se/mail/lib-2019-03/0100.html
-  */
- 
- #include <config.h>
-@@ -45,6 +63,7 @@
- #include <stdint.h>
- #include <inttypes.h>
- #include <string.h>
-+#include <unistd.h>
- #include <assert.h>
- #include <pthread.h>
- 
-@@ -62,115 +81,321 @@ NBDKIT_DLL_PUBLIC int curl_debug_pool = 0;
- 
- unsigned connections = 4;
- 
--/* This lock protects access to the curl_handles vector below. */
--static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
-+/* Pipe used to notify background thread that a command is pending in
-+ * the queue.  A pointer to the 'struct command' is sent over the
-+ * pipe.
-+ */
-+static int self_pipe[2] = { -1, -1 };
- 
--/* List of curl handles.  This is allocated dynamically as more
-- * handles are requested.  Currently it does not shrink.  It may grow
-- * up to 'connections' in length.
-+/* The curl multi handle. */
-+static CURLM *multi;
-+
-+/* List of running easy handles.  We only need to maintain this so we
-+ * can remove them from the multi handle when cleaning up.
-  */
- DEFINE_VECTOR_TYPE (curl_handle_list, struct curl_handle *);
- static curl_handle_list curl_handles = empty_vector;
- 
--/* The condition is used when the curl handles vector is full and
-- * we're waiting for a thread to put_handle.
-- */
--static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
--static size_t in_use = 0, waiting = 0;
-+static const char *
-+command_type_to_string (enum command_type type)
-+{
-+  switch (type) {
-+  case EASY_HANDLE: return "EASY_HANDLE";
-+  case STOP:        return "STOP";
-+  default:          abort ();
-+  }
-+}
- 
- int
- pool_get_ready (void)
- {
-+  multi = curl_multi_init ();
-+  if (multi == NULL) {
-+    nbdkit_error ("curl_multi_init failed: %m");
-+    return -1;
-+  }
-+
-   return 0;
- }
- 
-+/* Start and stop the background thread. */
-+static pthread_t thread;
-+static bool thread_running;
-+static void *pool_worker (void *);
-+
- int
- pool_after_fork (void)
- {
-+  int err;
-+
-+  if (pipe (self_pipe) == -1) {
-+    nbdkit_error ("pipe: %m");
-+    return -1;
-+  }
-+
-+  /* Start the pool background thread where all the curl work is done. */
-+  err = pthread_create (&thread, NULL, pool_worker, NULL);
-+  if (err != 0) {
-+    errno = err;
-+    nbdkit_error ("pthread_create: %m");
-+    return -1;
-+  }
-+  thread_running = true;
-+
-   return 0;
- }
- 
--/* Close and free all handles in the pool. */
-+/* Unload the background thread. */
- void
- pool_unload (void)
- {
--  size_t i;
-+  if (thread_running) {
-+    /* Stop the background thread. */
-+    struct command cmd = { .type = STOP };
-+    send_command_and_wait (&cmd);
-+    pthread_join (thread, NULL);
-+    thread_running = false;
-+  }
- 
--  if (curl_debug_pool)
--    nbdkit_debug ("unload_pool: number of curl handles allocated: %zu",
--                  curl_handles.len);
-+  if (self_pipe[0] >= 0) {
-+    close (self_pipe[0]);
-+    self_pipe[0] = -1;
-+  }
-+  if (self_pipe[1] >= 0) {
-+    close (self_pipe[1]);
-+    self_pipe[1] = -1;
-+  }
- 
--  for (i = 0; i < curl_handles.len; ++i)
--    free_handle (curl_handles.ptr[i]);
--  curl_handle_list_reset (&curl_handles);
-+  if (multi) {
-+    size_t i;
-+
-+    /* Remove and free any easy handles in the multi. */
-+    for (i = 0; i < curl_handles.len; ++i) {
-+      curl_multi_remove_handle (multi, curl_handles.ptr[i]->c);
-+      free_handle (curl_handles.ptr[i]);
-+    }
-+
-+    curl_multi_cleanup (multi);
-+    multi = NULL;
-+  }
- }
- 
--/* Get a handle from the pool.
-- *
-- * It is owned exclusively by the caller until they call put_handle.
-+/* Command queue. */
-+static _Atomic uint64_t id;     /* next command ID */
-+
-+/* Send command to the background thread and wait for completion.
-+ * This is only called by one of the nbdkit threads.
-  */
--struct curl_handle *
--get_handle (void)
-+CURLcode
-+send_command_and_wait (struct command *cmd)
- {
--  ACQUIRE_LOCK_FOR_CURRENT_SCOPE (&lock);
--  size_t i;
--  struct curl_handle *ch;
-+  cmd->id = id++;
- 
-- again:
--  /* Look for a handle which is not in_use. */
--  for (i = 0; i < curl_handles.len; ++i) {
--    ch = curl_handles.ptr[i];
--    if (!ch->in_use) {
--      ch->in_use = true;
--      in_use++;
--      if (curl_debug_pool)
--        nbdkit_debug ("get_handle: %zu", ch->i);
--      return ch;
--    }
--  }
--
--  /* If more connections are allowed, then allocate a new handle. */
--  if (curl_handles.len < connections) {
--    ch = allocate_handle ();
--    if (ch == NULL)
--      return NULL;
--    if (curl_handle_list_append (&curl_handles, ch) == -1) {
--      free_handle (ch);
--      return NULL;
--    }
--    ch->i = curl_handles.len - 1;
--    ch->in_use = true;
--    in_use++;
--    if (curl_debug_pool)
--      nbdkit_debug ("get_handle: %zu", ch->i);
--    return ch;
--  }
--
--  /* Otherwise we have run out of connections so we must wait until
--   * another thread calls put_handle.
-+  /* CURLcode is 0 (CURLE_OK) or > 0, so use -1 as a sentinel to
-+   * indicate that the command has not yet been completed and status
-+   * set.
-    */
--  assert (in_use == connections);
--  waiting++;
--  while (in_use == connections)
--    pthread_cond_wait (&cond, &lock);
--  waiting--;
-+  cmd->status = -1;
- 
--  goto again;
-+  /* This will be used to signal command completion back to us. */
-+  pthread_mutex_init (&cmd->mutex, NULL);
-+  pthread_cond_init (&cmd->cond, NULL);
-+
-+  /* Send the command to the background thread. */
-+  if (write (self_pipe[1], &cmd, sizeof cmd) != sizeof cmd)
-+    abort ();
-+
-+  /* Wait for the command to be completed by the background thread. */
-+  {
-+    ACQUIRE_LOCK_FOR_CURRENT_SCOPE (&cmd->mutex);
-+    while (cmd->status == -1) /* for -1, see above */
-+      pthread_cond_wait (&cmd->cond, &cmd->mutex);
-+  }
-+
-+  pthread_mutex_destroy (&cmd->mutex);
-+  pthread_cond_destroy (&cmd->cond);
-+
-+  /* Note the main thread must call nbdkit_error on error! */
-+  return cmd->status;
- }
- 
--/* Return the handle to the pool. */
--void
--put_handle (struct curl_handle *ch)
-+/* The background thread. */
-+static struct command *process_multi_handle (void);
-+static void check_for_finished_handles (void);
-+static void retire_command (struct command *cmd, CURLcode code);
-+static void do_easy_handle (struct command *cmd);
-+
-+static void *
-+pool_worker (void *vp)
- {
--  ACQUIRE_LOCK_FOR_CURRENT_SCOPE (&lock);
-+  bool stop = false;
-+
-+  if (curl_debug_pool)
-+    nbdkit_debug ("curl: background thread started");
-+
-+  while (!stop) {
-+    struct command *cmd = NULL;
-+
-+    cmd = process_multi_handle ();
-+    if (cmd == NULL)
-+      continue; /* or die?? */
-+
-+    if (curl_debug_pool)
-+      nbdkit_debug ("curl: dispatching %s command %" PRIu64,
-+                    command_type_to_string (cmd->type), cmd->id);
-+
-+    switch (cmd->type) {
-+    case STOP:
-+      stop = true;
-+      retire_command (cmd, CURLE_OK);
-+      break;
-+
-+    case EASY_HANDLE:
-+      do_easy_handle (cmd);
-+      break;
-+    }
-+  } /* while (!stop) */
- 
-   if (curl_debug_pool)
--    nbdkit_debug ("put_handle: %zu", ch->i);
-+    nbdkit_debug ("curl: background thread stopped");
-+
-+  return NULL;
-+}
-+
-+/* Process the multi handle, and look out for new commands.  Returns
-+ * when there is a new command.
-+ */
-+static struct command *
-+process_multi_handle (void)
-+{
-+  struct curl_waitfd extra_fds[1] =
-+  { { .fd = self_pipe[0], .events = CURL_WAIT_POLLIN } };
-+  CURLMcode mc;
-+  int numfds, running_handles;
-+  struct command *cmd = NULL;
-+#ifndef HAVE_CURL_MULTI_POLL
-+  int repeats = 0;
-+#endif
-+
-+  while (!cmd) {
-+    /* Process the multi handle. */
-+    mc = curl_multi_perform (multi, &running_handles);
-+    if (mc != CURLM_OK) {
-+      nbdkit_error ("curl_multi_perform: %s", curl_multi_strerror (mc));
-+      return NULL;
-+    }
-+
-+    check_for_finished_handles ();
-+
-+#ifdef HAVE_CURL_MULTI_POLL
-+    mc = curl_multi_poll (multi, extra_fds, 1, 1000000, &numfds);
-+    if (mc != CURLM_OK) {
-+      nbdkit_error ("curl_multi_poll: %s", curl_multi_strerror (mc));
-+      return NULL;
-+    }
-+#else
-+    /* This is the older curl_multi_wait function.  For unclear
-+     * reasons this often gets "stuck" in the nbdkit_nanosleep case
-+     * below, wasting large amounts of time.  Luckily the newer curl
-+     * no longer uses this function.
-+     */
-+    mc = curl_multi_wait (multi, extra_fds, 1, 1000000, &numfds);
-+    if (mc != CURLM_OK) {
-+      nbdkit_error ("curl_multi_wait: %s", curl_multi_strerror (mc));
-+      return NULL;
-+    }
-+
-+    if (numfds == 0) {
-+      repeats++;
-+      if (repeats > 1)
-+        nbdkit_nanosleep (1, 0);
-+      continue;
-+    }
-+    else
-+      repeats = 0;
-+#endif
-+
-+    if (curl_debug_pool)
-+      nbdkit_debug (
-+#ifdef HAVE_CURL_MULTI_POLL
-+                    "curl_multi_poll"
-+#else
-+                    "curl_multi_wait"
-+#endif
-+                    ": running_handles=%d numfds=%d",
-+                    running_handles, numfds);
-+
-+    if (extra_fds[0].revents == CURL_WAIT_POLLIN) {
-+      /* There's a command waiting. */
-+      if (read (self_pipe[0], &cmd, sizeof cmd) != sizeof cmd)
-+        abort ();
-+    }
-+  }
-+
-+  return cmd;
-+}
-+
-+/* This checks if any easy handles in the multi have
-+ * finished and retires the associated commands.
-+ */
-+static void
-+check_for_finished_handles (void)
-+{
-+  CURLMsg *msg;
-+  int msgs_in_queue;
-+
-+  while ((msg = curl_multi_info_read (multi, &msgs_in_queue)) != NULL) {
-+    size_t i;
-+    struct curl_handle *ch = NULL;
-+
-+    if (msg->msg == CURLMSG_DONE) {
-+      /* Find this curl_handle. */
-+      for (i = 0; i < curl_handles.len; ++i) {
-+        if (curl_handles.ptr[i]->c == msg->easy_handle) {
-+          ch = curl_handles.ptr[i];
-+          curl_handle_list_remove (&curl_handles, i);
-+          break;
-+        }
-+      }
-+      if (ch == NULL) abort ();
-+      curl_multi_remove_handle (multi, ch->c);
-+
-+      retire_command (ch->cmd, msg->data.result);
-+    }
-+  }
-+}
-+
-+/* Retire a command.  status is a CURLcode. */
-+static void
-+retire_command (struct command *cmd, CURLcode status)
-+{
-+  if (curl_debug_pool)
-+    nbdkit_debug ("curl: retiring %s command %" PRIu64,
-+                  command_type_to_string (cmd->type), cmd->id);
-+
-+  ACQUIRE_LOCK_FOR_CURRENT_SCOPE (&cmd->mutex);
-+  cmd->status = status;
-+  pthread_cond_signal (&cmd->cond);
-+}
-+
-+static void
-+do_easy_handle (struct command *cmd)
-+{
-+  CURLMcode mc;
-+
-+  cmd->ch->cmd = cmd;
-+
-+  /* Add the handle to the multi. */
-+  mc = curl_multi_add_handle (multi, cmd->ch->c);
-+  if (mc != CURLM_OK) {
-+    nbdkit_error ("curl_multi_add_handle: %s", curl_multi_strerror (mc));
-+    goto err;
-+  }
- 
--  ch->in_use = false;
--  in_use--;
-+  if (curl_handle_list_append (&curl_handles, cmd->ch) == -1)
-+    goto err;
-+  return;
- 
--  /* Signal the next thread which is waiting. */
--  if (waiting > 0)
--    pthread_cond_signal (&cond);
-+ err:
-+  retire_command (cmd, CURLE_OUT_OF_MEMORY);
- }
--- 
-2.39.3
-
diff --git a/0024-curl-Redefine-connections-N-parameter-as-number-of-H.patch b/0024-curl-Redefine-connections-N-parameter-as-number-of-H.patch
deleted file mode 100644
index c2494d9..0000000
--- a/0024-curl-Redefine-connections-N-parameter-as-number-of-H.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From d33cf724dccd014f854a90bb7341fd36f890bb01 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Fri, 28 Jul 2023 11:49:24 +0100
-Subject: [PATCH] curl: Redefine connections=<N> parameter as number of HTTP
- connections
-
-Previously (nbdkit 1.34) this was the number of easy handles.  However
-it turns out that easy handles can open multiple HTTP connections, and
-in fact there's no good way to tell how many (and they are not
-shared).
-
-Now that we are using a curl multi, curl >= 7.30 provides a way to
-limit the total number of actual HTTP connections, so we should just
-use it.  This is closer to what I intended this parameter to mean.
-
-Also update the documentation to properly describe previous and
-current behaviour.
-
-Link: https://curl.se/mail/lib-2019-03/0102.html
-Link: https://curl.se/mail/lib-2019-12/0044.html
-Reviewed-by: Eric Blake <eblake@redhat.com>
-(cherry picked from commit 2bb03f898e49ec892070055b6975914642fa8c5c)
----
- plugins/curl/config.c               |  2 +-
- plugins/curl/curldefs.h             |  3 +++
- plugins/curl/nbdkit-curl-plugin.pod | 37 +++++++++++++++++++----------
- plugins/curl/pool.c                 |  6 ++++-
- 4 files changed, 34 insertions(+), 14 deletions(-)
-
-diff --git a/plugins/curl/config.c b/plugins/curl/config.c
-index ce82d5f9..a7501707 100644
---- a/plugins/curl/config.c
-+++ b/plugins/curl/config.c
-@@ -494,7 +494,7 @@ curl_config_complete (void)
- const char *curl_config_help =
-   "cainfo=<CAINFO>            Path to Certificate Authority file.\n"
-   "capath=<CAPATH>            Path to directory with CA certificates.\n"
--  "connections=<N>            Number of libcurl connections to use.\n"
-+  "connections=<N>            Number of HTTP connections to use.\n"
-   "cookie=<COOKIE>            Set HTTP/HTTPS cookies.\n"
-   "cookiefile=                Enable cookie processing.\n"
-   "cookiefile=<FILENAME>      Read cookies from file.\n"
-diff --git a/plugins/curl/curldefs.h b/plugins/curl/curldefs.h
-index 6b158d85..73e7a3b4 100644
---- a/plugins/curl/curldefs.h
-+++ b/plugins/curl/curldefs.h
-@@ -50,6 +50,9 @@
-  * macro isn't present then Curl is very old.
-  */
- #ifdef CURL_AT_LEAST_VERSION
-+#if CURL_AT_LEAST_VERSION (7, 30, 0)
-+#define HAVE_CURLMOPT_MAX_TOTAL_CONNECTIONS
-+#endif
- #if CURL_AT_LEAST_VERSION (7, 55, 0)
- #define HAVE_CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
- #endif
-diff --git a/plugins/curl/nbdkit-curl-plugin.pod b/plugins/curl/nbdkit-curl-plugin.pod
-index 7784b553..9821f111 100644
---- a/plugins/curl/nbdkit-curl-plugin.pod
-+++ b/plugins/curl/nbdkit-curl-plugin.pod
-@@ -58,10 +58,10 @@ L<CURLOPT_CAPATH(3)> for more information.
- 
- (nbdkit E<ge> 1.34)
- 
--Open up to C<N> curl connections to the web server.  The default is 4.
--Curl connections are shared between all NBD clients, so you may wish
--to increase this if you expect many simultaneous NBD clients (or a
--single client using many multi-conn connections).
-+Open up to C<N> connections to the web server.  The default is 16.
-+Connections are shared between all NBD clients, so you may wish to
-+increase this if you expect many simultaneous NBD clients (or a single
-+client using many multi-conn connections).
- 
- See L</NBD CONNECTIONS AND CURL HANDLES> below.
- 
-@@ -397,15 +397,28 @@ user-agent header.
- =head1 NBD CONNECTIONS AND CURL HANDLES
- 
- nbdkit E<le> 1.32 used a simple model where a new NBD connection would
--create a new libcurl handle.  In practice this meant there was a
--1-to-1 relationship between NBD connections and HTTP connections to
--the remote web server (assuming http: or https: URL).
-+create a new libcurl handle.  Since a libcurl handle maintains a small
-+cache of connections, this meant that the number of HTTP connections
-+would be a small multiple of the number of incoming NBD connections
-+and the total would not be limited (assuming http: or https: URL).
- 
--nbdkit E<ge> 1.34 changed to using a fixed pool of libcurl handles
--shared across all NBD connections.  You can control the maximum number
--of curl handles in the pool with the C<connections> parameter (default
--4).  Note that if there are more than 4 NBD connections, they will
--share the 4 web server connections, unless you adjust C<connections>.
-+nbdkit 1.34 changed to using a fixed pool of libcurl handles shared
-+across all NBD connections.  You can control the maximum number of
-+curl handles in the pool with the C<connections> parameter (default
-+4).  Since each curl handle maintains a small cache of connections,
-+this meant that the number of HTTP connections would be a small
-+multiple of the C<connections> parameter.  If there are more than 4
-+incoming NBD connections, they will contend for the libcurl handles,
-+unless you adjust C<connections>.
-+
-+nbdkit E<ge> 1.36 changed again to use a curl multi handle
-+(L<libcurl-multi(3)>).  Now the C<connections> parameter controls the
-+maximum number of HTTP connections made to the remote server
-+(L<CURLMOPT_MAX_TOTAL_CONNECTIONS(3)>).  This is more efficient
-+especially with HTTP/2 and HTTP/3, where each HTTP connection can
-+contain a very large number of streams (typically up to 100)
-+multiplexed over one connection.  The default for C<connections> was
-+raised to 16.
- 
- =head1 HEADER AND COOKIE SCRIPTS
- 
-diff --git a/plugins/curl/pool.c b/plugins/curl/pool.c
-index 254951d1..7d44dfe5 100644
---- a/plugins/curl/pool.c
-+++ b/plugins/curl/pool.c
-@@ -79,7 +79,7 @@
- /* Use '-D curl.pool=1' to debug handle pool. */
- NBDKIT_DLL_PUBLIC int curl_debug_pool = 0;
- 
--unsigned connections = 4;
-+unsigned connections = 16;
- 
- /* Pipe used to notify background thread that a command is pending in
-  * the queue.  A pointer to the 'struct command' is sent over the
-@@ -115,6 +115,10 @@ pool_get_ready (void)
-     return -1;
-   }
- 
-+#ifdef HAVE_CURLMOPT_MAX_TOTAL_CONNECTIONS
-+  curl_multi_setopt(multi, CURLMOPT_MAX_TOTAL_CONNECTIONS, (long) connections);
-+#endif
-+
-   return 0;
- }
- 
--- 
-2.39.3
-
diff --git a/0025-curl-Disable-this-plugin-on-Windows.patch b/0025-curl-Disable-this-plugin-on-Windows.patch
deleted file mode 100644
index d8d6635..0000000
--- a/0025-curl-Disable-this-plugin-on-Windows.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 852f23db007b13ca8e9e5548c3becbdc78e16601 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 1 Aug 2023 11:29:04 +0100
-Subject: [PATCH] curl: Disable this plugin on Windows
-
-There is no self pipe trick for Windows (or there is, but it would
-require substantial porting work).
-
-(cherry picked from commit 9b0759377f6779bbecc8647c026dcdac7f2ebd89)
----
- plugins/curl/Makefile.am | 5 ++++-
- tests/Makefile.am        | 2 ++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/curl/Makefile.am b/plugins/curl/Makefile.am
-index 7529fb2f..971365f1 100644
---- a/plugins/curl/Makefile.am
-+++ b/plugins/curl/Makefile.am
-@@ -34,6 +34,8 @@ include $(top_srcdir)/common-rules.mk
- EXTRA_DIST = nbdkit-curl-plugin.pod
- 
- if HAVE_CURL
-+# Disabled on Windows because no self-pipe.
-+if !IS_WINDOWS
- 
- plugin_LTLIBRARIES = nbdkit-curl-plugin.la
- 
-@@ -85,4 +87,5 @@ nbdkit-curl-plugin.1: nbdkit-curl-plugin.pod \
- 
- endif HAVE_POD
- 
--endif
-+endif !IS_WINDOWS
-+endif HAVE_CURL
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index f6c5ac9a..08514c7a 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -643,6 +643,7 @@ EXTRA_DIST += test-cdi.sh
- # curl plugin test.
- if HAVE_MKE2FS_WITH_D
- if HAVE_CURL
-+if !IS_WINDOWS
- TESTS += \
- 	test-curl-file.sh \
- 	test-curl-header-script-fail.sh \
-@@ -749,6 +750,7 @@ test_curl_cookie_script_LDADD = \
- 	$(LIBNBD_LIBS) \
- 	$(NULL)
- 
-+endif !IS_WINDOWS
- endif HAVE_CURL
- endif HAVE_MKE2FS_WITH_D
- 
--- 
-2.39.3
-
diff --git a/copy-patches.sh b/copy-patches.sh
index a9540ba..5b17fc5 100755
--- a/copy-patches.sh
+++ b/copy-patches.sh
@@ -6,7 +6,7 @@ set -e
 # directory.  Use it like this:
 #   ./copy-patches.sh
 
-rhel_version=9.3
+rhel_version=9.4
 
 # Check we're in the right directory.
 if [ ! -f nbdkit.spec ]; then
diff --git a/nbdkit.spec b/nbdkit.spec
index 0819dc8..37e3375 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -22,6 +22,8 @@
 %global have_ocaml 1
 %endif
 
+%global have_blkio 1
+
 # Architectures where we run the complete test suite including
 # the libguestfs tests.
 #
@@ -46,17 +48,17 @@ ExclusiveArch:  x86_64
 %global verify_tarball_signature 1
 
 # If there are patches which touch autotools files, set this to 1.
-%global patches_touch_autotools 1
+%global patches_touch_autotools %{nil}
 
 # The source directory.
-%global source_directory 1.34-stable
+%global source_directory 1.36-stable
 
 Name:           nbdkit
-Version:        1.34.2
+Version:        1.36.1
 Release:        1%{?dist}
 Summary:        NBD server
 
-License:        BSD
+License:        BSD-3-Clause
 URL:            https://gitlab.com/nbdkit/nbdkit
 
 %if 0%{?rhel} >= 8
@@ -75,34 +77,10 @@ Source2:        libguestfs.keyring
 Source3:        copy-patches.sh
 
 # Patches come from the upstream repository:
-# https://gitlab.com/nbdkit/nbdkit/-/commits/rhel-9.3/
+# https://gitlab.com/nbdkit/nbdkit/-/commits/rhel-9.4/
 
 # Patches.
-Patch0001:     0001-tests-test-connect.c-Skip-if-exit-with-parent-is-not.patch
-Patch0002:     0002-tests-Use-exit-with-parent-in-the-test-framework.patch
-Patch0003:     0003-protect-Fix-copy-and-paste-error-in-the-documentatio.patch
-Patch0004:     0004-docs-nbdkit-protocol.pod-Fix-manual-page-name.patch
-Patch0005:     0005-retry-request-Print-operation-we-are-retrying-in-deb.patch
-Patch0006:     0006-tests-test-ocaml-errorcodes.c-Don-t-use-assert-in-te.patch
-Patch0007:     0007-tests-test-ocaml-errorcodes.c-Enable-verbose-message.patch
-Patch0008:     0008-curl-Use-the-parallel-thread-model.patch
-Patch0009:     0009-curl-Add-ipresolve-option.patch
-Patch0010:     0010-curl-Add-resolve-option.patch
-Patch0011:     0011-curl-pool-Add-abstract-load_pool-and-unload_pool-fun.patch
-Patch0012:     0012-curl-Add-D-curl.times-1-to-collect-time-statistics.patch
-Patch0013:     0013-curl-Fix-call-to-update_times.patch
-Patch0014:     0014-curl-Move-configuration-code-to-a-separate-file.patch
-Patch0015:     0015-curl-Make-times-seconds-field-slightly-wider.patch
-Patch0016:     0016-curl-Use-_Atomic-type-to-accumulate-curl-timings.patch
-Patch0017:     0017-curl-Add-D-curl.verbose.ids-1-to-display-conn-and-xf.patch
-Patch0018:     0018-curl-Rename-unload_config-unload_pool-config_unload-.patch
-Patch0019:     0019-pool-Add-outline-get_ready-and-after_fork-functions.patch
-Patch0020:     0020-curl-Do-pool_unload-before-config_unload.patch
-Patch0021:     0021-retry-request-Allow-get_size-operation-to-be-retried.patch
-Patch0022:     0022-tests-test-retry-request-mirror.c-Don-t-assume-state.patch
-Patch0023:     0023-curl-Use-curl-multi-interface.patch
-Patch0024:     0024-curl-Redefine-connections-N-parameter-as-number-of-H.patch
-Patch0025:     0025-curl-Disable-this-plugin-on-Windows.patch
+#(none)
 
 # For automatic RPM Provides generation.
 # See: https://rpm-software-management.github.io/rpm/manual/dependency_generators.html
@@ -124,6 +102,9 @@ BuildRequires:  libguestfs-devel
 BuildRequires:  libvirt-devel
 BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
+%if !0%{?rhel}
+BuildRequires:  zlib-ng-devel
+%endif
 BuildRequires:  libzstd-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  libnbd-devel >= 1.3.11
@@ -132,6 +113,8 @@ BuildRequires:  e2fsprogs, e2fsprogs-devel
 %if !0%{?rhel}
 BuildRequires:  xorriso
 BuildRequires:  rb_libtorrent-devel
+%endif
+%if 0%{?have_blkio}
 BuildRequires:  libblkio-devel
 %endif
 BuildRequires:  bash-completion
@@ -224,7 +207,6 @@ reading the nbdkit(1) and nbdkit-plugin(3) manual pages.
 
 %package server
 Summary:        The %{name} server
-License:        BSD
 
 %description server
 This package contains the %{name} server with only the null plugin
@@ -235,7 +217,6 @@ the metapackage "nbdkit".
 
 %package basic-plugins
 Summary:        Basic plugins for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 
@@ -260,6 +241,8 @@ nbdkit-memory-plugin        A virtual memory plugin.
 
 nbdkit-ondemand-plugin      Create filesystems on demand.
 
+nbdkit-ones-plugin          Fill disk with repeated 0xff or other bytes.
+
 nbdkit-pattern-plugin       Fixed test pattern.
 
 nbdkit-partitioning-plugin  Create virtual disks from partitions.
@@ -277,7 +260,6 @@ nbdkit-zero-plugin          Zero-length plugin for testing.
 
 %package example-plugins
 Summary:        Example plugins for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 %if !0%{?rhel}
 # example4 is written in Perl.
@@ -291,10 +273,9 @@ This package contains example plugins for %{name}.
 # The plugins below have non-trivial dependencies are so are
 # packaged separately.
 
-%if !0%{?rhel}
+%if 0%{?have_blkio}
 %package blkio-plugin
 Summary:        libblkio NVMe, vhost-user, vDPA, VFIO plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description blkio-plugin
@@ -306,7 +287,6 @@ for %{name}.
 %if !0%{?rhel}
 %package cc-plugin
 Summary:        Write small inline C plugins and scripts for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 Requires:       gcc
 Requires:       %{_bindir}/cat
@@ -321,7 +301,6 @@ in C, install %{name}-devel for that.
 %if !0%{?rhel}
 %package cdi-plugin
 Summary:        Containerized Data Import plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 Requires:       jq
 Requires:       podman
@@ -333,7 +312,6 @@ This package contains Containerized Data Import support for %{name}.
 
 %package curl-plugin
 Summary:        HTTP/FTP (cURL) plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description curl-plugin
@@ -343,7 +321,6 @@ This package contains cURL (HTTP/FTP) support for %{name}.
 %if !0%{?rhel} && 0%{?have_libguestfs}
 %package guestfs-plugin
 Summary:        libguestfs plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description guestfs-plugin
@@ -354,7 +331,6 @@ This package is a libguestfs plugin for %{name}.
 %if !0%{?rhel}
 %package iso-plugin
 Summary:        Virtual ISO 9660 plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 Requires:       xorriso
 
@@ -366,7 +342,6 @@ This package is a virtual ISO 9660 (CD-ROM) plugin for %{name}.
 %if !0%{?rhel}
 %package libvirt-plugin
 Summary:        Libvirt plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description libvirt-plugin
@@ -378,7 +353,6 @@ virDomainBlockPeek API.
 
 %package linuxdisk-plugin
 Summary:        Virtual Linux disk plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 # for mke2fs
 Requires:       e2fsprogs
@@ -390,7 +364,6 @@ This package is a virtual Linux disk plugin for %{name}.
 %if !0%{?rhel}
 %package lua-plugin
 Summary:        Lua plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description lua-plugin
@@ -400,7 +373,6 @@ This package lets you write Lua plugins for %{name}.
 
 %package nbd-plugin
 Summary:        NBD proxy / forward plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description nbd-plugin
@@ -411,7 +383,6 @@ to another NBD server.
 %if !0%{?rhel} && 0%{?have_ocaml}
 %package ocaml-plugin
 Summary:        OCaml plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description ocaml-plugin
@@ -423,7 +394,6 @@ To compile OCaml plugins you will also need to install
 
 %package ocaml-plugin-devel
 Summary:        OCaml development environment for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 Requires:       %{name}-ocaml-plugin%{?_isa} = %{version}-%{release}
 
@@ -435,7 +405,6 @@ This package lets you write OCaml plugins for %{name}.
 %if !0%{?rhel}
 %package perl-plugin
 Summary:        Perl plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description perl-plugin
@@ -445,7 +414,6 @@ This package lets you write Perl plugins for %{name}.
 
 %package python-plugin
 Summary:        Python 3 plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description python-plugin
@@ -455,7 +423,6 @@ This package lets you write Python 3 plugins for %{name}.
 %if !0%{?rhel}
 %package ruby-plugin
 Summary:        Ruby plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description ruby-plugin
@@ -468,7 +435,6 @@ This package lets you write Ruby plugins for %{name}.
 # which varies across architectures, RPM does not allow this.
 %package S3-plugin
 Summary:        Amazon S3 and Ceph plugin for %{name}
-License:        BSD
 Requires:       %{name}-python-plugin >= 1.22
 # XXX Should not need to add this.
 Requires:       python3-boto3
@@ -481,7 +447,6 @@ or Ceph using %{name}.
 
 %package ssh-plugin
 Summary:        SSH plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description ssh-plugin
@@ -491,7 +456,6 @@ This package contains SSH support for %{name}.
 %if !0%{?rhel}
 %package tcl-plugin
 Summary:        Tcl plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description tcl-plugin
@@ -501,7 +465,6 @@ This package lets you write Tcl plugins for %{name}.
 
 %package tmpdisk-plugin
 Summary:        Remote temporary filesystem disk plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 # For mkfs and mke2fs (defaults).
 Requires:       util-linux, e2fsprogs
@@ -518,7 +481,6 @@ This package is a remote temporary filesystem disk plugin for %{name}.
 %if !0%{?rhel}
 %package torrent-plugin
 Summary:        BitTorrent plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description torrent-plugin
@@ -529,7 +491,6 @@ This package is a BitTorrent plugin for %{name}.
 %ifarch x86_64
 %package vddk-plugin
 Summary:        VMware VDDK plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 # https://bugzilla.redhat.com/show_bug.cgi?id=1931818
 Requires:       libxcrypt-compat
@@ -542,7 +503,6 @@ VMware VDDK for accessing VMware disks and servers.
 
 %package basic-filters
 Summary:        Basic filters for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description basic-filters
@@ -568,6 +528,8 @@ nbdkit-delay-filter        Inject read and write delays.
 
 nbdkit-error-filter        Inject errors.
 
+nbdkit-evil-filter         Add random data corruption to reads.
+
 nbdkit-exitlast-filter     Exit on last client connection.
 
 nbdkit-exitwhen-filter     Exit gracefully when an event occurs.
@@ -606,6 +568,10 @@ nbdkit-pause-filter        Pause NBD requests.
 
 nbdkit-protect-filter      Write-protect parts of a plugin.
 
+%if !0%{?rhel}
+nbdkit-qcow2dec-filter     Decode qcow2 files.
+
+%endif
 nbdkit-rate-filter         Limit bandwidth by connection or server.
 
 nbdkit-readahead-filter    Prefetch data when reading sequentially.
@@ -626,7 +592,6 @@ nbdkit-truncate-filter     Truncate, expand, round up or round down size.
 %if !0%{?rhel}
 %package ext2-filter
 Summary:        ext2, ext3 and ext4 filesystem support for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description ext2-filter
@@ -637,7 +602,6 @@ This package contains ext2, ext3 and ext4 filesystem support for
 
 %package gzip-filter
 Summary:        GZip filter for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description gzip-filter
@@ -646,7 +610,6 @@ This package is a gzip filter for %{name}.
 
 %package stats-filter
 Summary:        Statistics filter for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description stats-filter
@@ -655,7 +618,6 @@ Display statistics about operations.
 
 %package tar-filter
 Summary:        Tar archive filter for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 Requires:       tar
 Obsoletes:      %{name}-tar-plugin < 1.23.9-3
@@ -666,7 +628,6 @@ This package is a tar archive filter for %{name}.
 
 %package xz-filter
 Summary:        XZ filter for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description xz-filter
@@ -675,7 +636,6 @@ This package is the xz filter for %{name}.
 
 %package devel
 Summary:        Development files and documentation for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig
 
@@ -687,7 +647,6 @@ plugins for %{name}.
 
 %package srpm-macros
 Summary:       RPM Provides rules for %{name} plugins and filters
-License:       BSD
 BuildArch:     noarch
 
 %description srpm-macros
@@ -697,7 +656,6 @@ for %{name} plugins and filters found in the plugins directory.
 
 %package bash-completion
 Summary:       Bash tab-completion for %{name}
-License:       BSD
 BuildArch:     noarch
 Requires:      bash-completion >= 2.0
 Requires:      %{name}-server = %{version}-%{release}
@@ -735,6 +693,11 @@ export PYTHON=%{__python3}
     --with-selinux \
     --with-ssh \
     --with-zlib \
+%if !0%{?rhel}
+    --with-zlib-ng \
+%else
+    --without-zlib-ng \
+%endif
     --enable-linuxdisk \
     --enable-python \
     --disable-golang \
@@ -751,7 +714,6 @@ export PYTHON=%{__python3}
     --enable-ruby \
     --enable-tcl \
     --enable-torrent \
-    --with-libblkio \
     --with-ext2 \
     --with-iso \
     --with-libvirt \
@@ -761,11 +723,15 @@ export PYTHON=%{__python3}
     --disable-ruby \
     --disable-tcl \
     --disable-torrent \
-    --without-libblkio \
     --without-ext2 \
     --without-iso \
     --without-libvirt \
 %endif
+%if 0%{?have_blkio}
+    --with-libblkio \
+%else
+    --without-libblkio \
+%endif
 %ifarch x86_64
     --enable-vddk \
 %else
@@ -801,13 +767,15 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/nbdkit-rust-plugin.3*
 
 %if 0%{?rhel}
-# In RHEL, remove some plugins we cannot --disable.
+# In RHEL, remove some plugins and filters we cannot --disable.
 for f in cc cdi ; do
     rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-$f-plugin.so
     rm -f $RPM_BUILD_ROOT%{_mandir}/man?/nbdkit-$f-plugin.*
 done
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-S3-plugin
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/nbdkit-S3-plugin.1*
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/filters/nbdkit-qcow2dec-filter.so
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/nbdkit-qcow2dec-filter.1*
 %endif
 
 # Install RPM dependency generator.
@@ -905,6 +873,7 @@ export LIBGUESTFS_TRACE=1
 %{_libdir}/%{name}/plugins/nbdkit-info-plugin.so
 %{_libdir}/%{name}/plugins/nbdkit-memory-plugin.so
 %{_libdir}/%{name}/plugins/nbdkit-ondemand-plugin.so
+%{_libdir}/%{name}/plugins/nbdkit-ones-plugin.so
 %{_libdir}/%{name}/plugins/nbdkit-partitioning-plugin.so
 %{_libdir}/%{name}/plugins/nbdkit-pattern-plugin.so
 %{_libdir}/%{name}/plugins/nbdkit-random-plugin.so
@@ -920,6 +889,7 @@ export LIBGUESTFS_TRACE=1
 %{_mandir}/man1/nbdkit-info-plugin.1*
 %{_mandir}/man1/nbdkit-memory-plugin.1*
 %{_mandir}/man1/nbdkit-ondemand-plugin.1*
+%{_mandir}/man1/nbdkit-ones-plugin.1*
 %{_mandir}/man1/nbdkit-partitioning-plugin.1*
 %{_mandir}/man1/nbdkit-pattern-plugin.1*
 %{_mandir}/man1/nbdkit-random-plugin.1*
@@ -939,7 +909,7 @@ export LIBGUESTFS_TRACE=1
 %{_mandir}/man1/nbdkit-example*-plugin.1*
 
 
-%if !0%{?rhel}
+%if 0%{?have_blkio}
 %files blkio-plugin
 %doc README.md
 %license LICENSE
@@ -1124,6 +1094,7 @@ export LIBGUESTFS_TRACE=1
 %{_libdir}/%{name}/filters/nbdkit-ddrescue-filter.so
 %{_libdir}/%{name}/filters/nbdkit-delay-filter.so
 %{_libdir}/%{name}/filters/nbdkit-error-filter.so
+%{_libdir}/%{name}/filters/nbdkit-evil-filter.so
 %{_libdir}/%{name}/filters/nbdkit-exitlast-filter.so
 %{_libdir}/%{name}/filters/nbdkit-exitwhen-filter.so
 %{_libdir}/%{name}/filters/nbdkit-exportname-filter.so
@@ -1143,6 +1114,9 @@ export LIBGUESTFS_TRACE=1
 %{_libdir}/%{name}/filters/nbdkit-partition-filter.so
 %{_libdir}/%{name}/filters/nbdkit-pause-filter.so
 %{_libdir}/%{name}/filters/nbdkit-protect-filter.so
+%if !0%{?rhel}
+%{_libdir}/%{name}/filters/nbdkit-qcow2dec-filter.so
+%endif
 %{_libdir}/%{name}/filters/nbdkit-rate-filter.so
 %{_libdir}/%{name}/filters/nbdkit-readahead-filter.so
 %{_libdir}/%{name}/filters/nbdkit-retry-filter.so
@@ -1160,6 +1134,7 @@ export LIBGUESTFS_TRACE=1
 %{_mandir}/man1/nbdkit-ddrescue-filter.1*
 %{_mandir}/man1/nbdkit-delay-filter.1*
 %{_mandir}/man1/nbdkit-error-filter.1*
+%{_mandir}/man1/nbdkit-evil-filter.1*
 %{_mandir}/man1/nbdkit-exitlast-filter.1*
 %{_mandir}/man1/nbdkit-exitwhen-filter.1*
 %{_mandir}/man1/nbdkit-exportname-filter.1*
@@ -1179,6 +1154,9 @@ export LIBGUESTFS_TRACE=1
 %{_mandir}/man1/nbdkit-partition-filter.1*
 %{_mandir}/man1/nbdkit-pause-filter.1*
 %{_mandir}/man1/nbdkit-protect-filter.1*
+%if !0%{?rhel}
+%{_mandir}/man1/nbdkit-qcow2dec-filter.1*
+%endif
 %{_mandir}/man1/nbdkit-rate-filter.1*
 %{_mandir}/man1/nbdkit-readahead-filter.1*
 %{_mandir}/man1/nbdkit-retry-filter.1*
@@ -1273,6 +1251,10 @@ export LIBGUESTFS_TRACE=1
 
 
 %changelog
+* Tue Oct 31 2023 Richard W.M. Jones <rjones@redhat.com> - 1.36.1-1
+- Rebase to 1.36.1
+  resolves: RHEL-14475
+
 * Tue Aug 01 2023 Richard W.M. Jones <rjones@redhat.com> - 1.34.2-1
 - Rebase to 1.34.2
   resolves: rhbz#2168629
diff --git a/sources b/sources
index 72215ec..6fc2555 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.34.2.tar.gz) = a279cdde6820729c0c4479a872c436f340f082f5534c53b05902fdfe7a4690d55fb5b449b97d29167d801138a4f1990eaea84092e9c170703819e123b8fdc131
-SHA512 (nbdkit-1.34.2.tar.gz.sig) = 0ca4097816d7f15ec7569c8043caafd2f6fa3e05c6f19ec260b0f2bec65f7be0077257025ac1a09806e2c831bc7556a7270ba0d6c3dbcbef38d7c6ffe5a610f4
+SHA512 (nbdkit-1.36.1.tar.gz) = ca0e6e6729fb6f43a9717a3815dfb8ff54a2f182ef079e72b0e5e1b018c55f2205be52a10abc0b0a2243d0737f27b1ccf67c0d9586135454a460d39dad79f042
+SHA512 (nbdkit-1.36.1.tar.gz.sig) = d0cf5e58f1d4e5fb601d33f6d1cba7fdc4f7085b3481775e061e89107e1d86cb524b1cae35e79a09873558945844993acd08294a74dbf0c289666caa39f0e243