From eefebbdaa80d8f5b3c21484991d0de2d6cd0dbcb Mon Sep 17 00:00:00 2001
From: Stephane Glondu <steph@glondu.net>
Date: Sat, 14 Mar 2026 09:43:03 +0100
Subject: [PATCH] New upstream version 6.1.1

---
 CHANGES.md                           | 8 +++++++-
 README.md                            | 4 ++--
 cohttp-async.opam                    | 5 +++--
 cohttp-async.opam.template           | 1 +
 cohttp-bench.opam                    | 5 +++--
 cohttp-bench.opam.template           | 1 +
 cohttp-curl-async.opam               | 5 +++--
 cohttp-curl-async.opam.template      | 1 +
 cohttp-curl-lwt.opam                 | 5 +++--
 cohttp-curl-lwt.opam.template        | 1 +
 cohttp-curl.opam                     | 5 +++--
 cohttp-curl.opam.template            | 1 +
 cohttp-eio.opam                      | 5 +++--
 cohttp-eio.opam.template             | 1 +
 cohttp-lwt-jsoo.opam                 | 5 +++--
 cohttp-lwt-jsoo.opam.template        | 1 +
 cohttp-lwt-unix.opam                 | 5 +++--
 cohttp-lwt-unix.opam.template        | 1 +
 cohttp-lwt.opam                      | 5 +++--
 cohttp-lwt.opam.template             | 1 +
 cohttp-mirage.opam                   | 5 +++--
 cohttp-mirage.opam.template          | 1 +
 cohttp-mirage/src/client.ml          | 2 +-
 cohttp-mirage/src/io.ml              | 2 +-
 cohttp-mirage/src/io.mli             | 2 +-
 cohttp-mirage/src/net.ml             | 4 ++--
 cohttp-mirage/src/static.ml          | 2 +-
 cohttp-mirage/src/static.mli         | 2 +-
 cohttp-server-lwt-unix.opam          | 5 +++--
 cohttp-server-lwt-unix.opam.template | 1 +
 cohttp-top.opam                      | 5 +++--
 cohttp-top.opam.template             | 1 +
 cohttp.opam                          | 5 +++--
 cohttp.opam.template                 | 1 +
 dune-project                         | 2 +-
 http.opam                            | 5 +++--
 http.opam.template                   | 1 +
 37 files changed, 73 insertions(+), 39 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5f70bd8..1f104be 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,10 @@
-# v6.1.0 (2025-03-03)
+## v6.1.1 (2025-05-28)
+
+- cohttp-mirage: make client usable again -- this fixes a regression introduced
+  by #1080 (@Firobe, review by @edwintorok, #1110)
+- rename main function on README example (@Unn4m3DD, #1097)
+
+## v6.1.0 (2025-03-03)
 
 - cohttp-lwt-unix: Add http/https proxy support for client requests (@art-w @MisterDA, #1080)
 - cohttp-mirage: Support conduit 8.0.0 (@hannesm, #1104)
diff --git a/README.md b/README.md
index 2a026f2..2436d5a 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ open Lwt
 open Cohttp
 open Cohttp_lwt_unix
 
-let body =
+let main =
   Client.get (Uri.of_string "https://www.reddit.com/") >>= fun (resp, body) ->
   let code = resp |> Response.status |> Code.code_of_status in
   Printf.printf "Response code: %d\n" code;
@@ -89,7 +89,7 @@ let body =
   body
 
 let () =
-  let body = Lwt_main.run body in
+  let body = Lwt_main.run main in
   print_endline ("Received body\n" ^ body)
 ```
 
diff --git a/cohttp-async.opam b/cohttp-async.opam
index 5234580..c1c438c 100644
--- a/cohttp-async.opam
+++ b/cohttp-async.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation for the Async concurrency library"
@@ -63,4 +63,5 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-available: arch != "s390x"
\ No newline at end of file
+available: arch != "s390x"
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file
diff --git a/cohttp-async.opam.template b/cohttp-async.opam.template
index 876f1f7..84c651e 100644
--- a/cohttp-async.opam.template
+++ b/cohttp-async.opam.template
@@ -13,3 +13,4 @@ build: [
   ]
 ]
 available: arch != "s390x"
+x-maintenance-intent: [ "(latest)" ]
diff --git a/cohttp-bench.opam b/cohttp-bench.opam
index 3f7dbcd..fac821a 100644
--- a/cohttp-bench.opam
+++ b/cohttp-bench.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Benchmarks binaries for Cohttp"
@@ -51,4 +51,5 @@ build: [
     "@cohttp-bench/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file
diff --git a/cohttp-bench.opam.template b/cohttp-bench.opam.template
index 6edcaf3..8c3e513 100644
--- a/cohttp-bench.opam.template
+++ b/cohttp-bench.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]
diff --git a/cohttp-curl-async.opam b/cohttp-curl-async.opam
index d855be4..0dffa0f 100644
--- a/cohttp-curl-async.opam
+++ b/cohttp-curl-async.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Cohttp client using Curl & Async as the backend"
@@ -52,4 +52,5 @@ build: [
     "@cohttp-curl-async/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file
diff --git a/cohttp-curl-async.opam.template b/cohttp-curl-async.opam.template
index 87a61e8..3b4adae 100644
--- a/cohttp-curl-async.opam.template
+++ b/cohttp-curl-async.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]
diff --git a/cohttp-curl-lwt.opam b/cohttp-curl-lwt.opam
index 49b43c8..c180c05 100644
--- a/cohttp-curl-lwt.opam
+++ b/cohttp-curl-lwt.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Cohttp client using Curl & Lwt as the backend"
@@ -51,4 +51,5 @@ build: [
     "@cohttp-curl-lwt/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file
diff --git a/cohttp-curl-lwt.opam.template b/cohttp-curl-lwt.opam.template
index a49a0e0..ced5cee 100644
--- a/cohttp-curl-lwt.opam.template
+++ b/cohttp-curl-lwt.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]
diff --git a/cohttp-curl.opam b/cohttp-curl.opam
index dcd07e1..0845bdb 100644
--- a/cohttp-curl.opam
+++ b/cohttp-curl.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Shared code between the individual cohttp-curl clients"
@@ -40,4 +40,5 @@ build: [
     "@cohttp-curl/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file
diff --git a/cohttp-curl.opam.template b/cohttp-curl.opam.template
index aef9de5..09c9873 100644
--- a/cohttp-curl.opam.template
+++ b/cohttp-curl.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]
diff --git a/cohttp-eio.opam b/cohttp-eio.opam
index d3ef96d..f7cbf9b 100644
--- a/cohttp-eio.opam
+++ b/cohttp-eio.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation with eio backend"
@@ -52,4 +52,5 @@ build: [
     "@cohttp-eio/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file
diff --git a/cohttp-eio.opam.template b/cohttp-eio.opam.template
index ee960d9..2d9bf65 100644
--- a/cohttp-eio.opam.template
+++ b/cohttp-eio.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]
diff --git a/cohttp-lwt-jsoo.opam b/cohttp-lwt-jsoo.opam
index e6d779c..a7e28d9 100644
--- a/cohttp-lwt-jsoo.opam
+++ b/cohttp-lwt-jsoo.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation for the Js_of_ocaml JavaScript compiler"
@@ -52,4 +52,5 @@ build: [
     "@cohttp-lwt-jsoo/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file
diff --git a/cohttp-lwt-jsoo.opam.template b/cohttp-lwt-jsoo.opam.template
index 0ff35b3..d37c3d1 100644
--- a/cohttp-lwt-jsoo.opam.template
+++ b/cohttp-lwt-jsoo.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]
diff --git a/cohttp-lwt-unix.opam b/cohttp-lwt-unix.opam
index 5255559..406e281 100644
--- a/cohttp-lwt-unix.opam
+++ b/cohttp-lwt-unix.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation for Unix and Windows using Lwt"
@@ -59,4 +59,5 @@ build: [
     "@cohttp-lwt-unix/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file
diff --git a/cohttp-lwt-unix.opam.template b/cohttp-lwt-unix.opam.template
index 75ab83a..8b5d336 100644
--- a/cohttp-lwt-unix.opam.template
+++ b/cohttp-lwt-unix.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]
diff --git a/cohttp-lwt.opam b/cohttp-lwt.opam
index 487026e..8c4d9e6 100644
--- a/cohttp-lwt.opam
+++ b/cohttp-lwt.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation using the Lwt concurrency library"
@@ -52,4 +52,5 @@ build: [
     "@cohttp-lwt/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file
diff --git a/cohttp-lwt.opam.template b/cohttp-lwt.opam.template
index bb5ecb0..d737510 100644
--- a/cohttp-lwt.opam.template
+++ b/cohttp-lwt.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]
diff --git a/cohttp-mirage.opam b/cohttp-mirage.opam
index ef93290..56f20ba 100644
--- a/cohttp-mirage.opam
+++ b/cohttp-mirage.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation for the MirageOS unikernel"
@@ -59,4 +59,5 @@ build: [
     "@cohttp-mirage/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file
diff --git a/cohttp-mirage.opam.template b/cohttp-mirage.opam.template
index 12c1e06..e887f36 100644
--- a/cohttp-mirage.opam.template
+++ b/cohttp-mirage.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]
diff --git a/cohttp-mirage/src/client.ml b/cohttp-mirage/src/client.ml
index 1f06e74..f9fd32a 100644
--- a/cohttp-mirage/src/client.ml
+++ b/cohttp-mirage/src/client.ml
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * cohttp v6.1.0
+ * cohttp v6.1.1
  *)
 
 module Make (R : Resolver_mirage.S) (S : Conduit_mirage.S) = struct
diff --git a/cohttp-mirage/src/io.ml b/cohttp-mirage/src/io.ml
index cfd7147..936e8fd 100644
--- a/cohttp-mirage/src/io.ml
+++ b/cohttp-mirage/src/io.ml
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * cohttp v6.1.0
+ * cohttp v6.1.1
  *)
 
 open Lwt.Infix
diff --git a/cohttp-mirage/src/io.mli b/cohttp-mirage/src/io.mli
index b9422ca..816aef1 100644
--- a/cohttp-mirage/src/io.mli
+++ b/cohttp-mirage/src/io.mli
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * cohttp v6.1.0
+ * cohttp v6.1.1
  *)
 
 (** Cohttp IO implementation using Mirage channels. *)
diff --git a/cohttp-mirage/src/net.ml b/cohttp-mirage/src/net.ml
index 8375888..249363a 100644
--- a/cohttp-mirage/src/net.ml
+++ b/cohttp-mirage/src/net.ml
@@ -18,8 +18,8 @@ module Make (R : Resolver_mirage.S) (S : Conduit_mirage.S) = struct
   type endp = Conduit.endp
   type client
 
-  let tunnel = failwith "Unimplemented"
-  let connect_client = failwith "Unimplemented"
+  let tunnel _ _ = failwith "Unimplemented"
+  let connect_client ~ctx:_ _ = failwith "Unimplemented"
   let resolve ~ctx uri = R.resolve_uri ~uri ctx.resolver
 
   let connect_endp ~ctx endp =
diff --git a/cohttp-mirage/src/static.ml b/cohttp-mirage/src/static.ml
index 8b4adde..7e678c3 100644
--- a/cohttp-mirage/src/static.ml
+++ b/cohttp-mirage/src/static.ml
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * cohttp v6.1.0
+ * cohttp v6.1.1
  *)
 
 module Key = Mirage_kv.Key
diff --git a/cohttp-mirage/src/static.mli b/cohttp-mirage/src/static.mli
index 6de49c7..c71ec15 100644
--- a/cohttp-mirage/src/static.mli
+++ b/cohttp-mirage/src/static.mli
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * cohttp v6.1.0
+ * cohttp v6.1.1
  *)
 
 (** Serve static HTTP sites from a Mirage key-value store. *)
diff --git a/cohttp-server-lwt-unix.opam b/cohttp-server-lwt-unix.opam
index f462a7f..8a6ff30 100644
--- a/cohttp-server-lwt-unix.opam
+++ b/cohttp-server-lwt-unix.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Lightweight Cohttp + Lwt based HTTP server"
@@ -46,4 +46,5 @@ build: [
     "@cohttp-server-lwt-unix/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file
diff --git a/cohttp-server-lwt-unix.opam.template b/cohttp-server-lwt-unix.opam.template
index e2f8753..8b29608 100644
--- a/cohttp-server-lwt-unix.opam.template
+++ b/cohttp-server-lwt-unix.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]
diff --git a/cohttp-top.opam b/cohttp-top.opam
index fe47786..8d3cea9 100644
--- a/cohttp-top.opam
+++ b/cohttp-top.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP toplevel pretty printers for HTTP types"
@@ -43,4 +43,5 @@ build: [
     "@cohttp-top/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file
diff --git a/cohttp-top.opam.template b/cohttp-top.opam.template
index 7fc8179..a9e1f00 100644
--- a/cohttp-top.opam.template
+++ b/cohttp-top.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]
diff --git a/cohttp.opam b/cohttp.opam
index 3552273..b3c303f 100644
--- a/cohttp.opam
+++ b/cohttp.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "An OCaml library for HTTP clients and servers"
@@ -64,4 +64,5 @@ build: [
     "@cohttp/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file
diff --git a/cohttp.opam.template b/cohttp.opam.template
index c393af7..eb9d8fa 100644
--- a/cohttp.opam.template
+++ b/cohttp.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]
diff --git a/dune-project b/dune-project
index f03e57b..cc41ea2 100644
--- a/dune-project
+++ b/dune-project
@@ -1,7 +1,7 @@
 (lang dune 3.8)
 
 (name cohttp)
-(version v6.1.0)
+(version v6.1.1)
 
 (license ISC)
 
diff --git a/http.opam b/http.opam
index 0909a06..1effc19 100644
--- a/http.opam
+++ b/http.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Type definitions of HTTP essentials"
@@ -49,4 +49,5 @@ build: [
     "@http/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file
diff --git a/http.opam.template b/http.opam.template
index 4c18700..c20f934 100644
--- a/http.opam.template
+++ b/http.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]
-- 
2.30.2